SCD changes for PC/SC under W32.

36 files changed, 10430 insertions, 8827 deletions

diff --git a/agent/ChangeLog b/agent/ChangeLog
index e076675ae..c3798c143 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-14  Werner Koch  <[email protected]>
+
+	* gpg-agent.c (get_agent_scd_notify_event): Need to use a manual
+	reset event.
+
 2008-09-29  Werner Koch  <[email protected]>
 
 	* agent.h (GCRY_MD_USER): Rename to GCRY_MODULE_ID_USER.
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 872ba3433..55f2d4ffb 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -378,8 +378,10 @@ start_scd (ctrl_t ctrl)
     char buf[100];
 
 #ifdef HAVE_W32_SYSTEM
-    snprintf (buf, sizeof buf, "OPTION event-signal=%lx", 
-              (unsigned long)get_agent_scd_notify_event ());
+    /* Use estream snprintf due to a bug in mingw32 related to the l
+       modifier.  */
+    estream_snprintf (buf, sizeof buf, "OPTION event-signal=%lx", 
+                      (unsigned long)get_agent_scd_notify_event ());
 #else
     snprintf (buf, sizeof buf, "OPTION event-signal=%d", SIGUSR2);
 #endif
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index dc13c9908..bc3c43eaf 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1268,12 +1268,34 @@ get_agent_scd_notify_event (void)
 
   if (!the_event)
     {
+      HANDLE h, h2;
       SECURITY_ATTRIBUTES sa = { sizeof (SECURITY_ATTRIBUTES), NULL, TRUE};
 
-      the_event = CreateEvent ( &sa, FALSE, FALSE, NULL);
-      if (!the_event)
+      /* We need to use manual reset evet object due to the way our
+         w32-pth wait function works: If we would use an automatic
+         reset event we are not able to figure out which handle has
+         been signaled because at the time we single out the signaled
+         handles using WFSO the event has already been reset due to
+         the WFMO.  */
+      h = CreateEvent (&sa, TRUE, FALSE, NULL);
+      if (!h)
         log_error ("can't create scd notify event: %s\n", w32_strerror (-1) );
+      else if (!DuplicateHandle (GetCurrentProcess(), h,
+                                 GetCurrentProcess(), &h2,
+                                 EVENT_MODIFY_STATE|SYNCHRONIZE, TRUE, 0)) 
+        {
+          log_error ("setting syncronize for scd notify event failed: %s\n",
+                     w32_strerror (-1) );
+          CloseHandle (h);
+        }
+      else
+        {
+          CloseHandle (h);
+          the_event = h2;
+        }
     }
+
+  log_debug  ("returning notify handle %p\n", the_event);
   return the_event;
 }
 #endif /*HAVE_W32_SYSTEM*/
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index d633ec30c..ab2aae850 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -226,7 +226,7 @@ checked right before it is used.
 @opindex delete-keys
 Delete the keys matching @var{pattern}.  Note that there is no command
 to delete the secret part of the key directly.  In case you need to do
-this, you should run the command @code{gpg --dump-secret-keys KEYID}
+this, you should run the command @code{gpgsm --dump-secret-keys KEYID}
 before you delete the key, copy the string of hex-digits in the
 ``keygrip'' line and delete the file consisting of these hex-digits
 and the suffix @code{.key} from the @file{private-keys-v1.d} directory
diff --git a/po/be.po b/po/be.po
index 37876abb5..64d96b7dc 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -93,20 +93,20 @@ msgstr ""
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -171,20 +171,33 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Паўтарыце пароль: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Паўтарыце пароль: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+msgid "Reset Code not correctly repeated; try again"
+msgstr ""
+
+#: agent/divert-scd.c:291
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -372,7 +385,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -389,30 +402,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
@@ -1084,7 +1097,7 @@ msgstr ""
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "сакрэтны ключ недаступны"
@@ -1094,160 +1107,173 @@ msgstr "сакрэтны ключ недаступны"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+msgid "This command is only available for version 2 cards\n"
+msgstr ""
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+msgid "Reset Code not or not anymore available\n"
+msgstr ""
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr ""
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr ""
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr ""
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 #, fuzzy
 msgid "not forced"
 msgstr "непадтрымліваецца"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1255,133 +1281,137 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "Даведка адсутнічае"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Загад> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
@@ -1389,12 +1419,12 @@ msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1441,7 +1471,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
@@ -1460,7 +1490,7 @@ msgstr "збой падпісаньня: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr ""
@@ -1485,7 +1515,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1674,7 +1704,7 @@ msgstr "паказаць ключы й адбіткі пальцаў"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1919,7 +1949,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1931,7 +1961,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr ""
 
@@ -1939,11 +1969,11 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -1951,7 +1981,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
@@ -2096,7 +2126,7 @@ msgstr "%s - гэта недапушчальнае мноства знакаў\n
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
@@ -2209,7 +2239,7 @@ msgstr "%s:%d: недапушчальныя выбары экспартаван�
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
@@ -2249,11 +2279,11 @@ msgstr ""
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
@@ -2329,149 +2359,149 @@ msgstr ""
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -2695,7 +2725,7 @@ msgstr ""
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
@@ -3225,8 +3255,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -3582,47 +3612,47 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3630,356 +3660,356 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2699
+#: g10/keyedit.c:2701
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2720
+#: g10/keyedit.c:2722
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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:3021
+#: g10/keyedit.c:3023
 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 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:3367
+#: g10/keyedit.c:3369
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3427
+#: g10/keyedit.c:3429
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3449
+#: g10/keyedit.c:3451
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3476
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4943
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4644,7 +4674,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -5063,11 +5093,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -5419,12 +5449,12 @@ msgstr ""
 msgid "no valid addressees\n"
 msgstr ""
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
@@ -5642,7 +5672,7 @@ msgstr ""
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -5745,48 +5775,48 @@ msgstr ""
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/sign.c:760
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:180
+#: g10/skclist.c:169
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr ""
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr ""
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
@@ -6157,66 +6187,76 @@ msgstr ""
 msgid "can't open fd %d: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "сакрэтны ключ недаступны"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "памылка чытаньня файла"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "пароль занадта доўгі\n"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 msgid "missing argument"
 msgstr ""
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "несумяшчальныя загады\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "непадтрымліваецца"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "непадтрымліваецца"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
@@ -6308,12 +6348,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6325,103 +6366,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "Паўтарыце пароль\n"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "Паўтарыце пароль\n"
@@ -6429,102 +6470,113 @@ msgstr "Паўтарыце пароль\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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 msgid "error reading application data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -6879,17 +6931,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7108,7 +7160,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7331,12 +7383,12 @@ msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 msgid "|N|use compress algorithm N"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7347,60 +7399,60 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr ""
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7878,11 +7930,6 @@ msgstr "грамадскі ключ ня знойдзены"
 msgid "No argument allowed"
 msgstr "сакрэтны ключ недаступны"
 
-#: tools/no-libgcrypt.c:30
-#, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "памылка стварэньня \"%s\": %s\n"
-
 #: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
diff --git a/po/ca.po b/po/ca.po
index 3ce2f2e19..95b293981 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -115,20 +115,20 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -193,22 +193,36 @@ msgstr ""
 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
+#: agent/divert-scd.c:219
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Introduïu el nom d'usuari: "
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Repetiu la contrasenya: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repetiu la contrasenya: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
+
+#: agent/divert-scd.c:291
 #, 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
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -402,7 +416,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -419,30 +433,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, 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:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
@@ -1152,7 +1166,7 @@ msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
 msgid "not human readable"
 msgstr "no llegible per humans"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la clau secreta no està disponible"
@@ -1164,31 +1178,42 @@ msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, 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:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
+
+# Parts?  Peces?  ivb
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "parts de la clau secreta no estan disponbles\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr "[no establert]"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr "home"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr "dóna"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr "no especificat"
 
@@ -1196,134 +1221,139 @@ 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:445
+#: g10/card-util.c:493
 msgid "not forced"
 msgstr "no forçat"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error en crear l'anell «%s»: %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, 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:815
+#: g10/card-util.c:901
 #, 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:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, 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:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1331,135 +1361,139 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, 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:1241
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau és disponible en: "
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
@@ -1467,12 +1501,12 @@ msgstr "L'ordre no és vàlida (proveu «help»)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1523,7 +1557,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
@@ -1542,7 +1576,7 @@ msgstr "Ha fallat el procés de signatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVÍS: «%s» és un fitxer buit\n"
@@ -1571,7 +1605,7 @@ msgid ""
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1781,7 +1815,7 @@ 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:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -2038,7 +2072,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:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2050,7 +2084,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Xifratge: "
 
@@ -2058,11 +2092,11 @@ msgstr "Xifratge: "
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -2070,7 +2104,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
@@ -2222,7 +2256,7 @@ msgstr "%s no és un joc de caràcters vàlid\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
@@ -2337,7 +2371,7 @@ msgstr "%s:%d opcions d'exportació no vàlides\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
@@ -2382,11 +2416,11 @@ msgstr ""
 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
@@ -2466,150 +2500,150 @@ msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 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:3355
+#: g10/gpg.c:3346
 #, 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:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 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:4263
+#: g10/gpg.c:4254
 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:4296
+#: g10/gpg.c:4287
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -2838,7 +2872,7 @@ msgstr "clau %08lX: clau nova - es descarta \n"
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
@@ -3432,8 +3466,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
@@ -3829,121 +3863,121 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3951,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:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3973,7 +4007,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3982,78 +4016,78 @@ 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 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:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4062,205 +4096,205 @@ 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:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 #, 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:3468
+#: g10/keyedit.c:3470
 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:3474
+#: g10/keyedit.c:3476
 #, 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 #, 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:3548
+#: g10/keyedit.c:3550
 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:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, 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:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, 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:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, 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:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 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:4660
+#: g10/keyedit.c:4662
 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:4687
+#: g10/keyedit.c:4689
 #, 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:4713
+#: g10/keyedit.c:4715
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4987,7 +5021,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
 
@@ -5423,12 +5457,12 @@ msgstr ""
 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:796
+#: g10/parse-packet.c:806
 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:1247
+#: g10/parse-packet.c:1257
 #, 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"
@@ -5823,12 +5857,12 @@ msgstr "%s: es descarta: la clau pública està desactivada\n"
 msgid "no valid addressees\n"
 msgstr "no hi ha adreces vàlides\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "clau %08lX: sense ID\n"
@@ -6065,7 +6099,7 @@ msgstr ""
 "no s'ha pogut evitar una clau feble per a xifratge simètric;\n"
 "hi ha hagut %d intents!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -6186,54 +6220,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:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, 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:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "es descarta «%s»: duplicat\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "es descarta «%s»: %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -6629,66 +6663,84 @@ msgstr "la línia d'entrada %u és massa llarga o hi falta un fí de línia\n"
 msgid "can't open fd %d: %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 msgid "argument not expected"
 msgstr ""
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "error de lectura"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "la línia és massa llarga\n"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "l'argument és invàlid"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "les ordres entren en conflicte\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "opcions d'importació no vàlides\n"
 
-#: jnlib/argparse.c:188
+# 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
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "no forçat"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "opcions d'importació no vàlides\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+# 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
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "no forçat"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opcions d'importació no vàlides\n"
@@ -6780,12 +6832,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6797,103 +6850,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, 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"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "canvia la contrasenya"
@@ -6901,103 +6954,114 @@ msgstr "canvia la contrasenya"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Seleccioneu la raó de la revocació:\n"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, 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"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -7370,17 +7434,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7618,7 +7682,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7839,12 +7903,12 @@ msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritme de compressió N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, 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:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7855,61 +7919,61 @@ msgstr ""
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = omet aquesta clau\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8391,11 +8455,6 @@ msgstr "no s'ha trobat la clau pública"
 msgid "No argument allowed"
 msgstr ""
 
-#: 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:152
 #, fuzzy
 msgid ""
diff --git a/po/cs.po b/po/cs.po
index 84c74cb18..f0da30a1a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -96,20 +96,20 @@ msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
@@ -172,21 +172,35 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: nepoda�ilo se vytvo�it hashovac� tabulku: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|PIN administr�tora"
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Opakujte tento PIN: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Opakujte tento PIN: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "PIN nen� zopakov�n spr�vn�; zkuste to znovu"
+
+#: agent/divert-scd.c:291
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nen� zopakov�n spr�vn�; zkuste to znovu"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, 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]"
@@ -378,7 +392,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -397,30 +411,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
@@ -1106,7 +1120,7 @@ msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu data\n"
 msgid "not human readable"
 msgstr "nen� v p��mo �iteln�m form�tu"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGp karta nen� dostupn�: %s\n"
@@ -1116,153 +1130,168 @@ msgstr "OpenPGp karta nen� dostupn�: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Tento p��kaz nen� v m�d� %s dovolen�.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr "[nen� nastaven]"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr "mu�"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr "�ena"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr "neuvedeno"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "not forced"
 msgstr "nen� vy�adov�no"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr "vy�adov�no"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 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:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak \"<\" nelze pou��t.\n"
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: V�ce mezer nen� povoleno.\n"
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr "P��jmen� dr�itele karty: "
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr "Jm�no (k�estn�) dr�itele karty: "
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, 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:585
+#: g10/card-util.c:636
 msgid "URL to retrieve public key: "
 msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, 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:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 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"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr "Login (jm�nu ��tu): "
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, 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:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr "Priv�tn� DO data: "
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, 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:798
+#: g10/card-util.c:884
 msgid "Language preferences: "
 msgstr "Jazykov� p�edvolby: "
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatn� d�lka �etezce s p�edvolbami.\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatn� znak v �et�zci s p�edvolbami\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 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:850
+#: g10/card-util.c:936
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s kl��em nen� mo�n�: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 msgid "not an OpenPGP card"
 msgstr "toto nen� OpenPGP karta"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, 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:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr "P�epsat existuj�c� kl��? (a/N) "
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 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:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr "P�epsat existuj�c� kl��e? (a/N) "
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1273,120 +1302,124 @@ msgstr ""
 "   PIN = `%s'     PIN administr�tora = `%s'\n"
 "Toto nastaven� m��ete zm�nit p��kazem --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 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:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovac� kl��\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �ifrovac� kl��\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 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:1231
+#: g10/card-util.c:1317
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�m� algoritmus pro ochranu kl��e\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 msgid "secret parts of key are not available\n"
 msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 msgid "list all available data"
 msgstr "vypi� v�echna dostupn� data"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr "zm�n� jm�no majitele karty"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr "zm�n� URL pro z�sk�n� kl��e"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr "z�sk� kl�� specifikovan� v URL karty"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 msgid "change the login name"
 msgstr "zm�nit login name"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 msgid "change the language preferences"
 msgstr "zm�nit jazykov� p�edvolby"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr "zm�n� pohlav� dr�itele karty"
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 msgid "change a CA fingerprint"
 msgstr "vypsat fingerprint certifika�n� autority"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 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:1325
+#: g10/card-util.c:1412
 msgid "generate new keys"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr "ov�� PIN a vypi� v�echna data"
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 msgid "Admin-only command\n"
 msgstr "pouze administr�torsk� p��kazy\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 msgid "Admin commands are allowed\n"
 msgstr "administr�torsk� p��kazy jsou povoleny\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
@@ -1394,12 +1427,12 @@ msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1446,7 +1479,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
@@ -1465,7 +1498,7 @@ msgstr "pou�it� �ifry: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
@@ -1492,7 +1525,7 @@ msgid ""
 msgstr ""
 "VAROV�N�: vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1688,7 +1721,7 @@ msgstr "CA fingerprint: "
 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:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
@@ -1937,7 +1970,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1949,7 +1982,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "�ifra: "
 
@@ -1957,11 +1990,11 @@ msgstr "�ifra: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -1969,7 +2002,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
@@ -2137,7 +2170,7 @@ msgstr "`%s' nen� platn� doba expirace podpisu\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
@@ -2248,7 +2281,7 @@ msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
@@ -2290,11 +2323,11 @@ msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
@@ -2374,148 +2407,148 @@ msgstr "pou�it� hashovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 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:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 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:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 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:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -2745,7 +2778,7 @@ 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:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
@@ -3301,8 +3334,8 @@ msgstr "Velmi pe�liv� jsem ov��il tento kl��.\n"
 msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
@@ -3655,45 +3688,45 @@ msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby? (a/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 msgid "Save changes? (y/N) "
 msgstr "Ulo�it zm�ny? (a/N) "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez ulo�en�? (a/N) "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 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:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr "Preferovan� keyserver: "
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3701,71 +3734,71 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, c-format
 msgid "usage: %s"
 msgstr "pou�it�: %s"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, c-format
 msgid "trust: %s"
 msgstr "d�v�ra: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr "��slo karty: "
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3773,17 +3806,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:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3791,7 +3824,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:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3800,74 +3833,74 @@ 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 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:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "neplatn�"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3876,190 +3909,190 @@ 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:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
 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:3474
+#: g10/keyedit.c:3476
 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:3535
+#: g10/keyedit.c:3537
 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:3541
+#: g10/keyedit.c:3543
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte nejv��e jeden podkl��.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�n�m dobu expirace podkl��e.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu expirace prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, 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:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 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:4148
+#: g10/keyedit.c:4150
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "P�epsat (a/N)? "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje u�ivatelsk� ID s hashem %s\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podkl�� s indexem %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, 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:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 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:4660
+#: g10/keyedit.c:4662
 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:4687
+#: g10/keyedit.c:4689
 #, 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:4713
+#: g10/keyedit.c:4715
 msgid " (non-revocable)"
 msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, 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:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Kl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podkl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, 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"
@@ -4760,7 +4793,7 @@ msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
 msgid "keyserver did not send VERSION\n"
 msgstr "server kl��� neposlal VERSION\n"
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
 
@@ -5181,11 +5214,11 @@ msgstr "VAROV�N�: nastaven� z `%s' nejsou p�i tomto spu�t�n� zat�m aktivn�\n"
 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:796
+#: g10/parse-packet.c:806
 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:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -5551,12 +5584,12 @@ msgstr "%s: p�esko�eno: ve�ejn� kl�� je neplatn� (disabled)\n"
 msgid "no valid addressees\n"
 msgstr "��dn� platn� adresy\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
@@ -5785,7 +5818,7 @@ msgstr ""
 "nemohu se vyvarovat slab�ho kl��e pro symetrickou �ifru; operaci jsem zkusil "
 "%d kr�t!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -5900,13 +5933,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:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5914,41 +5947,41 @@ msgstr ""
 "VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "p�esko�en \"%s\": duplikov�n\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "p�esko�en \"%s\": %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "p�esko�eno: tajn� kl�� je u� v datab�zi\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "toto je PGP kl�� vygenerovan� podle algoritmu ElGamal,\n"
@@ -6325,67 +6358,77 @@ msgstr "vstupn� ��dek %u je p��li� dlouh� nebo na konci chyb� znak LF\n"
 msgid "can't open fd %d: %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "chyba p�i �ten� souboru"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "neplatn� argument"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "pouze administr�torsk� p��kazy\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "nen� vy�adov�no"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "nen� vy�adov�no"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "neplatn� parametr pro v�pis\n"
@@ -6479,12 +6522,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
@@ -6496,104 +6540,104 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr "|N|Nov� PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ulo�en� datumu vytvo�en� se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpov�� neobsahuje RSA modulus\n"
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, 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"
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifikace CHV%d se nezda�ila: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, 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"
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
@@ -6601,100 +6645,111 @@ msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 msgid "|A|Admin PIN"
 msgstr "|A|PIN administr�tora"
 
-#. 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, fuzzy, c-format
+msgid "Reset Code 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"
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nov� PIN administr�tora"
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 msgid "error reading application data\n"
 msgstr "chyba p�i �ten� aplika�n�ch dat\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 msgid "error reading fingerprint DO\n"
 msgstr "chyba p�i �ten� fingerpritnu DO\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 msgid "key already exists\n"
 msgstr "kl�� ji� existuje\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr "existuj�c� kl�� bude p�eps�n\n"
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 msgid "generating new key\n"
 msgstr "generov�n� nov�ho kl��e\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr "chyb� �asov� raz�tko vytvo�en�\n"
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "sch�z� RSA modulus nebo nem� velikost %d bit�\n"
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, 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"
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, 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"
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr "pros�m po�kejte ne� bude kl�� vygenerov�n ...\n"
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 msgid "generating key failed\n"
 msgstr "henerov�n� kl��e se nezda�ilo\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generov�n� kl��e dokon�eno (%d sekund)\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatn� struktura OpenPGP kraty (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvo�en� podpisy: %lu\n"
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 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"
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
@@ -7052,17 +7107,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7288,7 +7343,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7516,12 +7571,12 @@ msgstr "podpis %s, hashovac� algoritmus %s\n"
 msgid "|N|use compress algorithm N"
 msgstr "nezn�m� komprima�n� algoritmus"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7532,60 +7587,60 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = p�esko�it tento kl��\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8067,11 +8122,6 @@ msgstr "ve�ejn� kl�� nenalezen"
 msgid "No argument allowed"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: 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:152
 #, fuzzy
 msgid ""
diff --git a/po/da.po b/po/da.po
index cdb42aff7..20c6b2cb0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -94,20 +94,20 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -171,22 +171,36 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Indtast bruger-id: "
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Gentag kodes�tning: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Gentag kodes�tning: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
+
+#: agent/divert-scd.c:291
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -378,7 +392,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -395,30 +409,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
@@ -1094,7 +1108,7 @@ msgstr "ingen gyldig OpenPGP data fundet.\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
@@ -1104,166 +1118,180 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+msgid "This command is only available for version 2 cards\n"
+msgstr ""
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "hemmelig n�gle ikke tilg�ngelig"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 #, fuzzy
 msgid "male"
 msgstr "sl�til"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "female"
 msgstr "sl�til"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 #, fuzzy
 msgid "not forced"
 msgstr "ikke bearbejdet"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 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"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingeraftryk:"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, 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:1036
+#: g10/card-util.c:1122
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1271,136 +1299,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, 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:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr ""
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
@@ -1408,12 +1440,12 @@ msgstr ""
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1460,7 +1492,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -1479,7 +1511,7 @@ msgstr "signering fejlede: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
@@ -1504,7 +1536,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1694,7 +1726,7 @@ msgstr "Fingeraftryk:"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1943,7 +1975,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1955,7 +1987,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr ""
 
@@ -1963,12 +1995,12 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -1976,7 +2008,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
@@ -2123,7 +2155,7 @@ msgstr "%s er ikke et gyldigt tegns�t\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
@@ -2240,7 +2272,7 @@ msgstr "ADVARSEL: '%s' er en tom fil\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
@@ -2280,11 +2312,11 @@ msgstr ""
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
@@ -2369,152 +2401,152 @@ 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:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3486
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -2742,7 +2774,7 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
@@ -3280,8 +3312,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
@@ -3660,47 +3692,47 @@ msgstr "Gener�r en annull�rbar certifikat"
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3708,370 +3740,370 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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:3021
+#: g10/keyedit.c:3023
 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 #, 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:3032
+#: g10/keyedit.c:3034
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 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:3367
+#: g10/keyedit.c:3369
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3387
+#: g10/keyedit.c:3389
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3427
+#: g10/keyedit.c:3429
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3449
+#: g10/keyedit.c:3451
 #, 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:3468
+#: g10/keyedit.c:3470
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3476
 #, 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 #, 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:4148
+#: g10/keyedit.c:4150
 #, 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:4210
+#: g10/keyedit.c:4212
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 #, 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:4660
+#: g10/keyedit.c:4662
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, 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:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4943
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4757,7 +4789,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -5181,11 +5213,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -5560,12 +5592,12 @@ msgstr "%s: udelod: offentlign�gle er sl�et fra\n"
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
@@ -5790,7 +5822,7 @@ msgstr ""
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -5893,49 +5925,49 @@ msgstr "Kan ikke tjekke signatur: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:760
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:180
+#: g10/skclist.c:169
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "vis pr�ferencer"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
@@ -6307,66 +6339,76 @@ msgstr ""
 msgid "can't open fd %d: %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "fill�sningsfejl"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 msgid "keyword too long"
 msgstr ""
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "ugyldigt argument"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "konfliktende kommandoer\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "ugyldig rustning"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "ikke bearbejdet"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "ugyldig rustning"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "ikke bearbejdet"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "ugyldig rustning"
@@ -6458,12 +6500,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6475,104 +6518,104 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
 # er det klogt at overs�tte TrustDB?
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "�ndr kodes�tningen"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "�ndr kodes�tningen"
@@ -6580,104 +6623,115 @@ msgstr "�ndr kodes�tningen"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "rev- forkert n�gletilbagekald\n"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fejl i trailerlinie\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gener�r et nyt n�glepar"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, 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:2082
+#: scd/app-openpgp.c:2466
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
@@ -7039,17 +7093,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7269,7 +7323,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7489,13 +7543,13 @@ msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7506,60 +7560,60 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "brug: gpg [flag] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s: udelod: %s\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8043,11 +8097,6 @@ msgstr "offentlig n�gle ikke fundet"
 msgid "No argument allowed"
 msgstr "skriver hemmeligt certifikat til '%s'\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:152
 #, fuzzy
 msgid ""
diff --git a/po/de.po b/po/de.po
index 71a1de48f..d388794c0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+0200\n"
 "PO-Revision-Date: 2008-06-27 14:10+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -98,20 +98,20 @@ msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -175,19 +175,33 @@ msgstr "Keine Übereinstimmung - bitte nochmal versuchen"
 msgid "failed to create stream from socket: %s\n"
 msgstr "Das Erzeugen eines Datenstrom aus dem Socket schlug fehl: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr "Admin-PIN"
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "PIN bitte wiederholen"
+
+#: agent/divert-scd.c:285
 msgid "Repeat this PIN"
 msgstr "PIN bitte wiederholen"
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
+
+#: agent/divert-scd.c:291
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Bitte geben Sie die PIN%s%s%s ein um die Karte zu entsperren"
@@ -385,7 +399,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Fehlerberichte bitte an <"
@@ -402,30 +416,30 @@ msgstr ""
 "Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für GnuPG\n"
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
@@ -1098,7 +1112,7 @@ msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
 msgid "not human readable"
 msgstr "nicht als Klartext darstellbar"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
@@ -1108,155 +1122,170 @@ msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Dieser Befehl ist im %s-Modus nicht erlaubt.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "Teile des geheimen Schlüssels sind nicht vorhanden\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr "[nicht gesetzt]"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr "männlich"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr "weiblich"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr "unbestimmt"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "not forced"
 msgstr "nicht zwingend"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr "zwingend"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr "Familienname des Kartenbesitzers:"
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr "Vorname des Kartenbesitzers:"
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 "Fehler: Der zusammengesetzte Name ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 msgid "URL to retrieve public key: "
 msgstr "URL um den öffentlichen Schlüssel zu holen: "
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr "Logindaten (Kontenname): "
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fehler: Logindaten sind zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr "Geheime DO-Daten: "
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fehler: Geheime DO-Daten sind zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 msgid "Language preferences: "
 msgstr "Spracheinstellungen"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Geschlecht: (Männlich (M), Weiblich (F) oder Leerzeichen): "
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ungültige Antwort.\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 msgid "CA fingerprint: "
 msgstr "CA-Fingerabdruck: "
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schlüsseloperation nicht möglich: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 msgid "not an OpenPGP card"
 msgstr "Keine gültige OpenPGP-Karte"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) "
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1267,120 +1296,124 @@ msgstr ""
 "   PIN = `%s'     Admin-PIN = `%s'\n"
 "Sie sollten sie mittels des Befehls --change-pin ändern\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 msgid "Please select the type of key to generate:\n"
 msgstr "Bitte wählen Sie die Art des Schlüssel, der erzeugt werden soll:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 msgid "   (1) Signature key\n"
 msgstr "   (1) Unterschriften-Schlüssel\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 msgid "Please select where to store the key:\n"
 msgstr "Wählen Sie den Speicherort für den Schlüssel:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 msgid "unknown key protection algorithm\n"
 msgstr "Unbekanntes Schlüssel-Schutzverfahren\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 msgid "secret parts of key are not available\n"
 msgstr "Geheime Teile des Schlüssels sind nicht vorhanden\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 msgid "secret key already stored on a card\n"
 msgstr "geheimer Schlüssel ist bereits auf einer Karte gespeichert\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 msgid "show admin commands"
 msgstr "Zeige Admin-Befehle"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 msgid "list all available data"
 msgstr "Alle vorhandenen Daten auflisten"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr "Kartenbesitzernamen ändern"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr "Schlüssel-holen-URL ändern"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr "Holen des Schlüssels mittels der URL auf der Karte"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 msgid "change the login name"
 msgstr "Ändern der Logindaten"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 msgid "change the language preferences"
 msgstr "Ändern der Spracheinstellungen"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr "Ändern des Geschlechts des Kartenbesitzers"
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 msgid "change a CA fingerprint"
 msgstr "Ändern des CA-Fingerabdrucks"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr "Umschalte des \"Signature-force-PIN\"-Schalters"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 msgid "generate new keys"
 msgstr "neue Schlüssel erzeugen"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr "Menü für Ändern oder Entsperren der PIN"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr "überprüfe die PIN und liste alle Daten auf"
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 msgid "Admin-only command\n"
 msgstr "nur-Admin Befehl\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 msgid "Admin commands are allowed\n"
 msgstr "Admin-Befehle sind erlaubt\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
@@ -1388,12 +1421,12 @@ msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1442,7 +1475,7 @@ msgstr ""
 "Verwenden Sie zunächst den Befehl \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encode.c:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@ -1463,7 +1496,7 @@ msgstr "benutze Cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
@@ -1494,7 +1527,7 @@ msgstr ""
 "WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %"
 "s (%d) verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1690,7 +1723,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ungültiger Schlüssel %s, gültig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1939,7 +1972,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1951,7 +1984,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Öff. Schlüssel: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Verschlü.: "
 
@@ -1959,11 +1992,11 @@ msgstr "Verschlü.: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr "Verwendete Bibliotheken:"
 
@@ -1971,7 +2004,7 @@ msgstr "Verwendete Bibliotheken:"
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
@@ -2128,7 +2161,7 @@ msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
@@ -2238,7 +2271,7 @@ msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
@@ -2286,11 +2319,11 @@ msgstr ""
 "Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-"
 "Verschlüsselung\n"
 
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
@@ -2369,152 +2402,152 @@ msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Im %s-Modus kann --symmetric --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
 "werden\n"
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "Im %s-Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
 
@@ -2743,7 +2776,7 @@ msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
@@ -3314,8 +3347,8 @@ msgstr "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -3676,114 +3709,114 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich ändern? (j/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 msgid "Save changes? (y/N) "
 msgstr "Änderungen speichern? (j/N) "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? (j/N) "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr "Bevorzugter Schlüsselserver:"
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 msgid "Notations: "
 msgstr "\"Notationen\": "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:2699
+#: g10/keyedit.c:2701
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Dieser Schlüssel wurde am %s von %s Schlüssel %s widerrufen\n"
 
-#: g10/keyedit.c:2720
+#: g10/keyedit.c:2722
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Dieser Schlüssel könnte durch %s mit Schlüssel %s  widerrufen worden sein"
 
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "erzeugt: %s"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "widerrufen: %s"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, c-format
 msgid "expired: %s"
 msgstr "verfallen: %s"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "verfällt: %s"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, c-format
 msgid "usage: %s"
 msgstr "Aufruf: %s"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, c-format
 msgid "trust: %s"
 msgstr "Vertrauen: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr "Gültigkeit: %s"
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr "Kartennummer:"
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3791,18 +3824,18 @@ msgstr ""
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "widerrufen"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "verfallen"
 
 # translated by wk
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3810,7 +3843,7 @@ msgstr ""
 "WARNUNG: Keine User-ID ist als primär markiert.  Dieser Befehl kann\n"
 "dazu führen, daß eine andere User-ID as primär angesehen wird.\n"
 
-#: g10/keyedit.c:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3820,74 +3853,74 @@ msgstr ""
 "könnte\n"
 "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
 
-#: g10/keyedit.c:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) "
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Sie können einem PGP2-artigen Schlüssel keine Foto-ID hinzufügen.\n"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "ungültig"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User-ID \"%s\": %d Signatur entfernt\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User-ID \"%s\": %d Signaturen entfernt\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User-ID \"%s\": bereits minimiert\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User-ID \"%s\": bereits sauber\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3897,198 +3930,198 @@ msgstr ""
 "         Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
 "         des Schlüssels führen.\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie können einem PGP2-artigen Schlüssel keine vorgesehenen Widerrufer "
 "hinzufügen.\n"
 
-#: g10/keyedit.c:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:3427
+#: g10/keyedit.c:3429
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:3449
+#: g10/keyedit.c:3451
 msgid "this key has already been designated as a revoker\n"
 msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann "
 "nicht rückgangig gemacht werden!\n"
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3476
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer festlegen? "
 "(j/N): "
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 msgid "Please select at most one subkey.\n"
 msgstr "Bitte wählen Sie höchstens einen Unterschlüssel aus.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 
-#: g10/keyedit.c:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "Unterschlüssel %s ist des Unterschreibens nicht mächtig und braucht deshalb "
 "keine Rücksignatur\n"
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 msgid "Enter the notation: "
 msgstr "Geben Sie die \"Notation\" ein: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 msgid "Proceed? (y/N) "
 msgstr "Fortfahren (j/N)? "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Hash %s\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kein Unterschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \"%s\"\n"
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   beglaubigt durch Ihren Schlüssel %s am %s%s%s\n"
 
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sie haben folgende User-IDs des Schlüssels %s beglaubigt:\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 msgid " (non-revocable)"
 msgstr " (unwiderrufbar)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n"
 
-#: g10/keyedit.c:4943
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Schlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Unterschlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\n"
@@ -4798,7 +4831,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr "Schlüsselserver sendete VERSION nicht\n"
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
 
@@ -5221,13 +5254,13 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "WARNUNG: Möglicherweise unsicherer symmetrisch verschlüsselter "
 "Sitzungsschlüssel\n"
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -5610,12 +5643,12 @@ msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
 msgid "no valid addressees\n"
 msgstr "Keine gültigen Adressaten\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Hinweis: Schlüssel %s besitzt nicht die %s Eigenschaft\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Hinweis: Schlüssel %s hat keine Einstellung für %s\n"
@@ -5851,7 +5884,7 @@ msgstr ""
 "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schlüssels für "
 "sym. Verschlüsselung nicht vermieden werden!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "Für DSA muß die Hashlänge ein Vielfaches von 8 Bit sein\n"
 
@@ -5972,13 +6005,13 @@ msgstr "Prüfung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s Unterschrift von: \"%s\"\n"
 
-#: g10/sign.c:760
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schlüsseln eine abgetrennte "
 "Unterschrift erzeugt werden\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5986,42 +6019,42 @@ msgstr ""
 "WARNUNG: Erzwingen des Hashverfahrens %s (%d) verstößt gegen die "
 "Empfängervoreinstellungen\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie Klartextunterschriften nur mit PGP-2.x-artigen "
 "Schlüssel machen\n"
 
-#: g10/sign.c:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschlüsselung wird verwendet\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
 "echten Zufallsgenerator verwendbar\n"
 
-#: g10/skclist.c:180
+#: g10/skclist.c:169
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "übersprungen \"%s\": doppelt\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "übersprungen \"%s\": %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "Dies ist ein durch PGP erzeugter Elgamal-Schlüssel. Das ist für Signaturen "
@@ -6406,60 +6439,70 @@ msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
 msgid "can't open fd %d: %s\n"
 msgstr "fd=%d kann nicht geöffnet werden: %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 msgid "argument not expected"
 msgstr "Argument nicht erwartet"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 msgid "read error"
 msgstr "Lesefehler"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 msgid "keyword too long"
 msgstr "Schlüsselwort ist zu lang"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 msgid "missing argument"
 msgstr "Fehlendes Argument"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 msgid "invalid command"
 msgstr "Ungültige Befehl"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 msgid "invalid alias definition"
 msgstr "Ungültige Alias-Definition"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "[Fehler - Nicht genügend Speicher]"
+
+#: jnlib/argparse.c:191
 msgid "invalid option"
 msgstr "Ungültige Option"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "Fehlendes Argument für Option \"%.50s\"\n"
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "Option \"%.50s\" erwartet kein Argument\n"
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Ungültiger Befehl \"%.50s\"\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "Option \"%.50s\" ist mehrdeutig\n"
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "Befehl \"%.50s\" ist mehrdeutig\n"
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "[Fehler - Nicht genügend Speicher]"
+
+#: jnlib/argparse.c:212
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "Ungültige Option \"%.50s\"\n"
@@ -6551,12 +6594,13 @@ msgstr ""
 "Syntax: kbxutil [Optionen] [Dateien]\n"
 "Anlistem exportieren und Importieren von KeyBox Dateien\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Bitte die PIN auf der Tastatur des Kartenleser eingeben"
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
@@ -6568,100 +6612,100 @@ msgstr "Die Nullpin wurde noch nicht geändert\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.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "Die Standard PIN wird für %s benutzt\n"
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "Die Standard PIN für %s konnte nicht benutzt werden: %s - Die Standard PIN "
 "wird nicht weiter benutzt\n"
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 "||Bitte die PIN auf der Tastatur des Kartenleser eingeben%%0A[Sigs erzeugt: %"
 "lu]"
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft gesperrt ist\n"
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
@@ -6670,107 +6714,118 @@ msgstr ""
 "|A|Bitte die Admin-PIN auf der Tastatur des Kartenleser eingeben%%0A"
 "[Verbliebene Versuche: %d]"
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "|A|Bitte die Admin-PIN auf der Tastatur des Kartenleser eingeben"
 
 #. 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:1590
+#: scd/app-openpgp.c:1657
 msgid "|A|Admin PIN"
 msgstr "|A|Admin-PIN"
 
-#. 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Bitte geben Sie die PIN%s%s%s ein um die Karte zu entsperren"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Neue Admin-PIN"
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 msgid "error reading fingerprint DO\n"
 msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 msgid "key already exists\n"
 msgstr "Schlüssel existiert bereits\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr "Existierender Schlüssel wird ersetzt werden\n"
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 msgid "generating new key\n"
 msgstr "neue Schlüssel werden erzeugt\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr "Erzeugungsdatum fehlt\n"
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Der RSA Modulus fehlt oder ist nicht %d Bits lang\n"
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n"
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Die RSA Primzahl %s fehlt oder ist nicht %d Bits lang\n"
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 msgid "generating key failed\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)}\n"
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr "Der Fingerabdruck auf der Karte entspricht nicht dem angeforderten.\n"
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "Die Überprüfung der Admin PIN is momentan durch einen Befehl verboten "
 "worden\n"
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@ -7122,18 +7177,18 @@ msgstr "Umgeschaltet auf das Kettenmodell"
 msgid "validation model used: %s"
 msgstr "Benutztes Gültigkeitsmodell: %s"
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s-Schlüssel verwendet ein unsicheres (%u-Bit) Hashverfahren\n"
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 "Ein %u-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(Dies ist der MD2 Algorithmus)\n"
 
@@ -7354,7 +7409,8 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr "Fertig.  Sie sollten nun diese Anforderung an die CA senden.\n"
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+#, fuzzy
+msgid "resource problem: out of core\n"
 msgstr "Resourcenproblem: Nicht genügend Hauptspeicher\n"
 
 #: sm/decrypt.c:324
@@ -7564,11 +7620,11 @@ msgstr "|NAME|Hashverfahren NAME benutzen"
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Aufruf: gpgsm [Optionen] [Dateien] (-h für Hilfe)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7577,58 +7633,58 @@ msgstr ""
 "Syntax: gpgsm [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME protocol\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 msgid "usage: gpgsm [options] "
 msgstr "Aufruf: gpgsm [Optionen] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "Hinweis: Verschlüsselung für `%s' wird nicht möglich sein: %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: Kein Server-Name angegeben\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: Zeile wird übersprungen\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 msgid "could not parse keyserver\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr "Dieser Befehl wurde noch nicht implementiert\n"
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
 
@@ -8109,11 +8165,6 @@ msgstr "Komponente nicht gefunden"
 msgid "No argument allowed"
 msgstr "Argumente sind nicht erlaubt"
 
-#: tools/no-libgcrypt.c:30
-#, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
-
 #: tools/symcryptrun.c:152
 msgid ""
 "@\n"
diff --git a/po/el.po b/po/el.po
index c81e0a333..08837ce15 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -94,20 +94,20 @@ msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
@@ -170,21 +170,35 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: �������� ����������� hashtable: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "����������� �� ����� ������: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "����������� �� ����� ������: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
+
+#: agent/divert-scd.c:291
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -377,7 +391,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -394,30 +408,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
@@ -1106,7 +1120,7 @@ msgstr "�������������: �������� �� ������ �������� ���������\n"
 msgid "not human readable"
 msgstr "�� ����������"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "�� ������� ������ ��� ����� ���������"
@@ -1116,166 +1130,181 @@ msgstr "�� ������� ������ ��� ����� ���������"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "������� ��� �������� �������� ��� ����� ���������\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "unspecified"
 msgstr "��� ���� ������� �����"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 #, fuzzy
 msgid "not forced"
 msgstr "�� �������������"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "����������� ��������"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1283,136 +1312,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "������ ��������� ���: "
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "change the login name"
 msgstr "������ ��� ����������� �����"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "������> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
@@ -1420,12 +1453,12 @@ msgstr "�� ������ ������  (��������� \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1475,7 +1508,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -1494,7 +1527,7 @@ msgstr "����� ��� ���������������: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
@@ -1525,7 +1558,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1731,7 +1764,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
@@ -1977,7 +2010,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1989,7 +2022,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "���������������: "
 
@@ -1997,11 +2030,11 @@ msgstr "���������������: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -2009,7 +2042,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
@@ -2161,7 +2194,7 @@ msgstr "�� %s ��� ����� ������ ��� ����������\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
@@ -2276,7 +2309,7 @@ msgstr "%s:%d: �� ������� �������� ��������\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
@@ -2320,11 +2353,11 @@ msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
@@ -2406,151 +2439,151 @@ msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -2778,7 +2811,7 @@ msgstr "������ %08lX:  ��� ������ - ������������\n"
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
@@ -3368,8 +3401,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
@@ -3752,117 +3785,117 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2699
+#: g10/keyedit.c:2701
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2720
+#: g10/keyedit.c:2722
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2728
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3870,19 +3903,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3890,7 +3923,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3899,75 +3932,75 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3977,38 +4010,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3427
+#: g10/keyedit.c:3429
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3449
+#: g10/keyedit.c:3451
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3476
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -4016,168 +4049,168 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "�������� ���������: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4943
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, 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"
@@ -4897,7 +4930,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -5323,11 +5356,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
@@ -5714,12 +5747,12 @@ msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
 msgid "no valid addressees\n"
 msgstr "������ ������ ���������\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
@@ -5949,7 +5982,7 @@ msgstr ""
 "�������� �������� �������� �������� ��� ���������� ��������������, ������ "
 "��� %d �����!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -6068,13 +6101,13 @@ msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/sign.c:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6082,41 +6115,41 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "�� ������ ��� ���� ��������� ��� ��������� - ��� ������ �� �������������� �� "
 "������� RNG!\n"
 
-#: g10/skclist.c:180
+#: g10/skclist.c:169
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "������������ `%s': ������������\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "������������ `%s': %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -6500,67 +6533,77 @@ msgstr "������ ������� %u ����� ���� ������ � ��� ������ �� LF\n"
 msgid "can't open fd %d: %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "������ ��������� �������"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "�� ������ ������"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "������������� �������\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "�� ������� �������� ���������\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "�� �������������"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "�� ������� �������� ���������\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "�� �������������"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "�� ������� �������� ���������\n"
@@ -6652,12 +6695,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6669,103 +6713,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "������ ��� ������ ������"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "������ ��� ������ ������"
@@ -6773,103 +6817,114 @@ 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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' ��� �����������\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
@@ -7229,17 +7284,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7465,7 +7520,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7685,12 +7740,12 @@ msgstr "|�����|����� ���������� ��������� ��������� ����� "
 msgid "|N|use compress algorithm N"
 msgstr "|N|����� ���������� ��������� N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7701,60 +7756,60 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�����: gpg [��������] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(��� ������ ���������)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = ��������� ����� ��� ��������\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8237,11 +8292,6 @@ msgstr "��� ������� �� ������� ������"
 msgid "No argument allowed"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: tools/no-libgcrypt.c:30
-#, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "�������� ����������� ��� ����������� `%s': %s\n"
-
 #: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
diff --git a/po/eo.po b/po/eo.po
index d2480ff23..96b882216 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -94,20 +94,20 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -170,22 +170,36 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Donu la uzantidentigilon: "
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Ripetu pasfrazon: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ripetu pasfrazon: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
+
+#: agent/divert-scd.c:291
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -377,7 +391,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -394,30 +408,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
@@ -1113,7 +1127,7 @@ msgstr "AVERTO: nevalida notacia dateno trovita\n"
 msgid "not human readable"
 msgstr "ne homlegebla"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta �losilo ne havebla"
@@ -1123,166 +1137,181 @@ msgstr "sekreta �losilo ne havebla"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "sekretaj �losilpartoj ne estas disponataj\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 #, fuzzy
 msgid "male"
 msgstr "en"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "female"
 msgstr "en"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenia kialo specifita"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, 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:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1290,136 +1319,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
@@ -1427,12 +1460,12 @@ msgstr "Nevalida komando (provu per \"helpo\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1481,7 +1514,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -1500,7 +1533,7 @@ msgstr "subskribado malsukcesis: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@ -1525,7 +1558,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1719,7 +1752,7 @@ msgstr "Fingrospuro:"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
@@ -1965,7 +1998,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1977,7 +2010,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr ""
 
@@ -1985,12 +2018,12 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -1998,7 +2031,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
@@ -2147,7 +2180,7 @@ msgstr "%s ne estas valida signaro\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
@@ -2264,7 +2297,7 @@ msgstr "AVERTO: '%s' estas malplena dosiero\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
@@ -2304,11 +2337,11 @@ msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
@@ -2393,149 +2426,149 @@ msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 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:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -2763,7 +2796,7 @@ msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
@@ -3356,8 +3389,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -3740,141 +3773,141 @@ msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3883,75 +3916,75 @@ 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 #, 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:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3961,201 +3994,201 @@ 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:3367
+#: g10/keyedit.c:3369
 #, 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:3387
+#: g10/keyedit.c:3389
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3427
+#: g10/keyedit.c:3429
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3449
+#: g10/keyedit.c:3451
 #, 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:3468
+#: g10/keyedit.c:3470
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3476
 #, 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 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:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 #, 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:4148
+#: g10/keyedit.c:4150
 #, 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:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, 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:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 #, 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:4660
+#: g10/keyedit.c:4662
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4943
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4876,7 +4909,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
@@ -5300,11 +5333,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
@@ -5684,12 +5717,12 @@ msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
@@ -5917,7 +5950,7 @@ 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:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -6030,52 +6063,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:760
+#: g10/sign.c:758
 #, 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:836
+#: g10/sign.c:834
 #, 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:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignoris '%s': ripetita\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -6454,67 +6487,77 @@ msgstr "enigata linio %u tro longa, a� mankas linifino\n"
 msgid "can't open fd %d: %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "legeraro �e dosiero"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "nevalida argumento"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "malkongruaj komandoj\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "nevalida kiraso"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "ne traktita"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "nevalida kiraso"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "ne traktita"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "nevalida kiraso"
@@ -6606,12 +6649,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6623,103 +6667,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "�an�i la pasfrazon"
@@ -6727,103 +6771,114 @@ msgstr "�an�i la pasfrazon"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Kialo por revoko: "
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "krei novan �losilparon"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -7196,17 +7251,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7433,7 +7488,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7653,12 +7708,12 @@ msgstr "|NOMO|uzi kompendi-metodon NOMO"
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7669,60 +7724,60 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = supersalti �i tiun �losilon\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8203,11 +8258,6 @@ msgstr "publika �losilo ne trovita"
 msgid "No argument allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: 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:152
 #, fuzzy
 msgid ""
diff --git a/po/es.po b/po/es.po
index 04ba7be7d..08d594830 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+0200\n"
 "PO-Revision-Date: 2008-05-27 22:38+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -113,20 +113,20 @@ msgstr "no pueden usarse claves ssh de m�s de %d bits\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -192,19 +192,33 @@ msgstr "no coincide - reint�ntelo"
 msgid "failed to create stream from socket: %s\n"
 msgstr "fallo al crear un flujo desde el socket: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr "PIN del Administrador"
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Repita este PIN"
+
+#: agent/divert-scd.c:285
 msgid "Repeat this PIN"
 msgstr "Repita este PIN"
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
+
+#: agent/divert-scd.c:291
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Por favor introduzca el PIN%s%s%s para desbloquear la tarjeta"
@@ -398,7 +412,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|FICHERO|escribir variables de entorno tambi�n en FICHERO"
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Por favor, informe de posibles \"bugs\" a <"
@@ -415,30 +429,30 @@ msgstr ""
 "Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
 "Manejo de claves privadas por GnuPG\n"
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "el nivel de depuraci�n `%s` no es v�lido\n"
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
@@ -1114,7 +1128,7 @@ msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
 msgid "not human readable"
 msgstr "ilegible"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tarjeta OpenPGP no disponible: %s\n"
@@ -1124,155 +1138,170 @@ msgstr "tarjeta OpenPGP no disponible: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Esta orden no se permite en modo %s.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "clave p�blica no disponible"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr "[no establecido]"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr "hombre"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr "mujer"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr "no especificado"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "not forced"
 msgstr "no forzado"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr "forzado"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: s�lo se permite ASCII sin formato actualmente.\n"
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: El caracter \"<\" no puede usarse.\n"
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: no se permiten dobles espacios.\n"
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr "Apellido del titular de la tarjeta: "
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr "Nombre del titular de la tarjeta: "
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, 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:585
+#: g10/card-util.c:636
 msgid "URL to retrieve public key: "
 msgstr "URL de donde recuperar la clave p�blica: "
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, 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:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error reservando memoria: %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr "Datos de login (nombre de la cuenta): "
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, 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:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr "Datos privados: "
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, 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:798
+#: g10/card-util.c:884
 msgid "Language preferences: "
 msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: longitud de la cadena de preferencias inv�lida.\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: caracteres inv�lidos en cadena de preferencias.\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 msgid "Error: invalid response.\n"
 msgstr "Error: respuesta no v�lida.\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 msgid "CA fingerprint: "
 msgstr "Huella dactilar CA:"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: formato inv�lido de huella dactilar.\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, 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:943
+#: g10/card-util.c:1029
 msgid "not an OpenPGP card"
 msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, 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:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr "�Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 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:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr "�Reemplazar las claves existentes? (s/N) "
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1283,120 +1312,124 @@ msgstr ""
 "   PIN = `%s'     PIN Administrador = `%s'\n"
 "Deber�a cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave que generar:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 msgid "   (1) Signature key\n"
 msgstr "    (1) Clave de firmado\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clave de cifrado\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija donde guardar la clave:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n de clave desconocido\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 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:1241
+#: g10/card-util.c:1327
 msgid "secret key already stored on a card\n"
 msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 msgid "list all available data"
 msgstr "listar todos los datos disponibles"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr "cambiar el nombre del titular de la tarjeta"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr "cambiar URL de donde obtener la clave"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr "recuperar la clave especificada en la URL de la tarjeta"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 msgid "change the login name"
 msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 msgid "change the language preferences"
 msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr "cambiar sexo del titular de la tarjeta"
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 msgid "change a CA fingerprint"
 msgstr "cambiar huella dactilar de una CA"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr "cambiar estado de la opci�n forzar firma del PIN"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 msgid "generate new keys"
 msgstr "generar nuevas claves"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr "men� para cambiar o desbloquear el PIN"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr "verificar PIN y listar todos los datos"
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 msgid "Admin-only command\n"
 msgstr "�rdenes s�lo de administrador\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 msgid "Admin commands are allowed\n"
 msgstr "Se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
@@ -1404,12 +1437,12 @@ msgstr "Orden inv�lida (pruebe \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1455,7 +1488,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
@@ -1474,7 +1507,7 @@ msgstr "usando cifrado %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
@@ -1502,7 +1535,7 @@ msgstr ""
 "AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1696,7 +1729,7 @@ msgstr "Huella dactilar CA:"
 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:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, 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"
@@ -1948,7 +1981,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1960,7 +1993,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Cifrado: "
 
@@ -1968,11 +2001,11 @@ msgstr "Cifrado: "
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr "Bibliotecas utilizadas:"
 
@@ -1980,7 +2013,7 @@ msgstr "Bibliotecas utilizadas:"
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
@@ -2131,7 +2164,7 @@ msgstr "`%s' no es una fecha de caducidad v�lida\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
@@ -2238,7 +2271,7 @@ msgstr "%s:%d: lista de auto-localizaci�n de claves inv�lida\n"
 msgid "invalid auto-key-locate list\n"
 msgstr "lista de auto-localizaci�n de claves inv�lida\n"
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
@@ -2278,11 +2311,11 @@ msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
@@ -2358,131 +2391,131 @@ msgstr "no puede usar el resumen `%s' en modo %s\n"
 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:3355
+#: g10/gpg.c:3346
 #, 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:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 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:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 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:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -2490,19 +2523,19 @@ 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:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -2735,7 +2768,7 @@ msgstr "clave %s: clave nueva - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
@@ -3287,8 +3320,8 @@ msgstr "He comprobado esta clave meticulosamente.\n"
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -3639,113 +3672,113 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "�Actualizar realmente las preferencias? (s/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 msgid "Save changes? (y/N) "
 msgstr "�Grabar cambios? (s/N) "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 msgid "Quit without saving? (y/N) "
 msgstr "�Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 msgid "Notations: "
 msgstr "Notaciones: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, c-format
 msgid "expired: %s"
 msgstr "caduc�: %s"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3753,17 +3786,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:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3771,7 +3804,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:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3780,74 +3813,74 @@ 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "inv�lida"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID de usuario \"%s\" compactado: %s\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID de usuario \"%s\": %d firma borrada\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID de usuario \"%s\": %d firmas borradas\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID de usuario \"%s\": ya minimizado\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya limpiado\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3856,189 +3889,189 @@ 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:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
 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:3474
+#: g10/keyedit.c:3476
 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la subclave de firmado %s ya est� certificada en cruz\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "la subclave %s no firma y as� no necesita ser certificada en cruz\n"
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 msgid "Enter the notation: "
 msgstr "Introduzca la notaci�n: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 msgid "Proceed? (y/N) "
 msgstr "�Continuar? (s/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, 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:4481
+#: g10/keyedit.c:4483
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ID de usuario con hash %s\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con �ndice %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, 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:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 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:4687
+#: g10/keyedit.c:4689
 #, 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:4713
+#: g10/keyedit.c:4715
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, 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"
@@ -4745,7 +4778,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr "el servidor de claves no envi� VERSION\n"
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
 
@@ -5160,12 +5193,12 @@ msgstr "AVISO: las opciones en `%s' no est�n a�n activas en esta ejecuci�n\n"
 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:796
+#: g10/parse-packet.c:806
 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:1247
+#: g10/parse-packet.c:1257
 #, 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"
@@ -5540,12 +5573,12 @@ msgstr "%s: omitida: clave p�blica deshabilitada\n"
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Nota: la clave %s no usa %s\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Nota: clave %s no tiene preferencias para %s\n"
@@ -5773,7 +5806,7 @@ msgstr ""
 "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
 "intentos!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA necesita un resumen cuya longitud sea m�ltiplo de 8 bits\n"
 
@@ -5887,13 +5920,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:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5901,38 +5934,38 @@ msgstr ""
 "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\" omitido: duplicado\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "omitido \"%s\": %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 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!"
@@ -6317,60 +6350,70 @@ msgstr "la l�nea %u es demasiado larga o no tiene avance de l�nea (LF)\n"
 msgid "can't open fd %d: %s\n"
 msgstr "no se puede abrir fd %d: %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 msgid "argument not expected"
 msgstr "par�metro inesperado"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 msgid "read error"
 msgstr "error de lectura"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 msgid "keyword too long"
 msgstr "palabra clave demasiado larga"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 msgid "missing argument"
 msgstr "falta el par�metro"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 msgid "invalid command"
 msgstr "orden inv�lida"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 msgid "invalid alias definition"
 msgstr "definici�n de alias inv�lida"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "[Error - core]"
+
+#: jnlib/argparse.c:191
 msgid "invalid option"
 msgstr "opci�n inv�lida"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "falta par�metro para la opci�n \"%.50s\"\n"
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "la opci�n \"%.50s\" no necesita par�metros\n"
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "orden inv�lida \"%.50s\"\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "la opci�n \"%.50s\" es ambigua\n"
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "la orden \"%.50s\" es ambigua\n"
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "[Error - core]"
+
+#: jnlib/argparse.c:212
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opci�n inv�lida \"%.50s\"\n"
@@ -6462,12 +6505,13 @@ msgstr ""
 "Sintaxis: kbxutil [opciones] [ficheros]\n"
 "listar, exportar, importar datos Keybox\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Por favor inntroduzca su PIN en el teclado del lector"
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
@@ -6479,98 +6523,98 @@ msgstr "el PIN-Nulo no ha sido cambiado\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.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, 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:1011
+#: scd/app-openpgp.c:1076
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallo leyendo clave p�blica: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr "la respuesta no incluye la clave p�blica\n"
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr "la respuesta no incluye el m�dulo RSA\n"
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la respuesta no incluye el exponente p�blico RSA\n"
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Introduzca su PIN en el teclado del lector%%OA[firmas hechas: %lu]"
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Por favor introduzca PIN%%0A[firmas hechas: %lu]"
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Por favor introduzca PIN%%0A[firmas hechas: %lu]"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, 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:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificaci�n CHV%d fall�: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr "el acceso a �rdenes de administrador no est� configurado\n"
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr "�la tarjeta est� bloqueada permanentemente!\n"
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, 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"
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
@@ -6579,106 +6623,117 @@ msgstr ""
 "|A|Introduzca PIN de Administrador en el teclado del lector%%0A[intentos "
 "restantes %d]"
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "|A|Introduzca PIN de Administrador en el teclado del lector"
 
 #. 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:1590
+#: scd/app-openpgp.c:1657
 msgid "|A|Admin PIN"
 msgstr "|A|PIN Administrador"
 
-#. 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Por favor introduzca el PIN%s%s%s para desbloquear la tarjeta"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, fuzzy, c-format
+msgid "Reset Code 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:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 msgid "error reading application data\n"
 msgstr "error leyendo datos de la aplicaci�n\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 msgid "error reading fingerprint DO\n"
 msgstr "error leyendo huella digital DO\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr "la clave existente ser� reemplazada\n"
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr "falta fecha de creaci�n\n"
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "falta el m�dulo RSA o no es de %d bits\n"
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "falta el exponente p�blico RSA o es mayor de %d bits\n"
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "el primo RSA %s falta o no es de %d bits\n"
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 msgid "generating key failed\n"
 msgstr "la generaci�n de la clave fall�\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generaci�n de clave completada (%d segundos)\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr "la huella digital en la tarjeta no coincide con la solicitada\n"
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "actualmente se prohibe verificar el PIN del Administrador con esta orden\n"
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
@@ -7016,17 +7071,17 @@ msgstr "cambiando al modelo en cadena"
 msgid "validation model used: %s"
 msgstr "modelo de validaci�n usado: %s"
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "la clave %s usa un hash inseguro (de %u bits)\n"
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "un hash de %u bits no vale para %u bits de la clave %s\n"
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(es el algoritmo MD2)\n"
 
@@ -7242,7 +7297,8 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr "Acabado. Deber�a mandar esta petici�n a su CA.\n"
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+#, fuzzy
+msgid "resource problem: out of core\n"
 msgstr "problema de recursos: core agotado\n"
 
 #: sm/decrypt.c:324
@@ -7457,11 +7513,11 @@ msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgsm [opciones] [ficheros] (-h para ayuda)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7471,59 +7527,59 @@ msgstr ""
 "firma, comprueba, cifra o descifra usando protocolo S/MIME\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpgsm [opciones] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "NOTA: no se podr� cifrar a `%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "modelo de validaci�n desconocido `%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "l�nea %d: falta nombre de entidad\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = saltar esta clave\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr "AVISO: ejecut�ndose con hora del sistema falsificada"
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importando certificados comunes `%s'\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no puedo firmar usando `%s': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr "esta orden no est� a�n implementada\n"
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7998,11 +8054,6 @@ msgstr "Componente no encontrado"
 msgid "No argument allowed"
 msgstr "No se permiten par�metros"
 
-#: tools/no-libgcrypt.c:30
-#, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "error reservando memoria: %s\n"
-
 # �rdenes, please...
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
@@ -9724,9 +9775,6 @@ msgstr ""
 #~ msgid "Too many preference items"
 #~ msgstr "Demasiados �tems de preferencias"
 
-#~ msgid "public key not anymore available"
-#~ msgstr "clave p�blica no disponible"
-
 #~ msgid "insert_trust_record: keyblock not found: %s\n"
 #~ msgstr "insert_trust_record: bloque de clave no encontrado: %s\n"
 
diff --git a/po/et.po b/po/et.po
index ac2606e35..2b0ba0442 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -94,20 +94,20 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
@@ -170,21 +170,35 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Korrake parooli: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Korrake parooli: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "parooli ei korratud �ieti; proovige uuesti"
+
+#: agent/divert-scd.c:291
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -376,7 +390,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -393,30 +407,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
@@ -1104,7 +1118,7 @@ msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 msgid "not human readable"
 msgstr "pole inimese poolt loetav"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salajane v�ti ei ole k�ttesaadav"
@@ -1114,166 +1128,181 @@ msgstr "salajane v�ti ei ole k�ttesaadav"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "See k�sklus ei ole %s moodis lubatud.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "unspecified"
 msgstr "P�hjus puudub"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 #, fuzzy
 msgid "not forced"
 msgstr "ei t��deldud"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, 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:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1281,136 +1310,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, 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:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, 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:1241
+#: g10/card-util.c:1327
 #, 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:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "V�tme leiate: "
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
@@ -1418,12 +1451,12 @@ msgstr "Vigane k�sklus (proovige \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1472,7 +1505,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -1491,7 +1524,7 @@ msgstr "kasutan �iffrit %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
@@ -1518,7 +1551,7 @@ msgid ""
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1722,7 +1755,7 @@ msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
@@ -1968,7 +2001,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1980,7 +2013,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "�iffer: "
 
@@ -1988,11 +2021,11 @@ msgstr "�iffer: "
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -2000,7 +2033,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
@@ -2149,7 +2182,7 @@ msgstr "%s ei ole lubatud kooditabel\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
@@ -2264,7 +2297,7 @@ msgstr "%s:%d: vigased ekspordi v�tmed\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
@@ -2305,11 +2338,11 @@ msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
@@ -2387,150 +2420,150 @@ msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 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:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -2759,7 +2792,7 @@ msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
@@ -3338,8 +3371,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
@@ -3720,117 +3753,117 @@ msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3838,19 +3871,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:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3858,7 +3891,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:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3867,75 +3900,75 @@ 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 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:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3944,197 +3977,197 @@ 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:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 #, 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:3468
+#: g10/keyedit.c:3470
 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:3474
+#: g10/keyedit.c:3476
 #, 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, 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:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 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:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, 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:4713
+#: g10/keyedit.c:4715
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, 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"
@@ -4845,7 +4878,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -5265,13 +5298,13 @@ msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 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:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
@@ -5648,12 +5681,12 @@ msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
@@ -5886,7 +5919,7 @@ msgstr ""
 "s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin %"
 "d korda!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -5995,52 +6028,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:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, 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:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' j�tsin vahele: duplikaat\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "`%s' j�tsin vahele: %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -6421,67 +6454,77 @@ msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
 msgid "can't open fd %d: %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "viga faili lugemisel"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "rida on liiga pikk\n"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "vigane argument"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "vastuolulised k�sud\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "vigased impordi v�tmed\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "ei t��deldud"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "vigased impordi v�tmed\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "ei t��deldud"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "vigased impordi v�tmed\n"
@@ -6573,12 +6616,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6590,103 +6634,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "muuda parooli"
@@ -6694,103 +6738,114 @@ msgstr "muuda parooli"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Palun valige t�histamise p�hjus:\n"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genereeri uus v�tmepaar"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -7150,17 +7205,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7385,7 +7440,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7605,12 +7660,12 @@ msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
 msgid "|N|use compress algorithm N"
 msgstr "|N|kasuta pakkimisalgoritmi N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7621,60 +7676,60 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " j = j�ta see v�ti vahele\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8157,11 +8212,6 @@ msgstr "ei leia avalikku v�tit"
 msgid "No argument allowed"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: 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:152
 #, fuzzy
 msgid ""
diff --git a/po/fi.po b/po/fi.po
index f95ff2226..b05ccf454 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -110,20 +110,20 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -186,21 +186,35 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Toista salasana: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Toista salasana: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
+
+#: agent/divert-scd.c:291
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -392,7 +406,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -410,30 +424,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
@@ -1123,7 +1137,7 @@ msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
 msgid "not human readable"
 msgstr "ei ihmisten luettavissa"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salaista avainta ei löydy"
@@ -1133,166 +1147,181 @@ msgstr "salaista avainta ei löydy"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Valintasi? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "unspecified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1300,136 +1329,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Komento> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
@@ -1437,12 +1470,12 @@ msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1491,7 +1524,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -1510,7 +1543,7 @@ msgstr "käytetään salakirjoitusalgoritmia %s\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
@@ -1536,7 +1569,7 @@ 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:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1738,7 +1771,7 @@ 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:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
@@ -1988,7 +2021,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2000,7 +2033,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Salaus: "
 
@@ -2008,11 +2041,11 @@ msgstr "Salaus: "
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -2020,7 +2053,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
@@ -2169,7 +2202,7 @@ msgstr "%s ei kelpaa merkistöksi\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
@@ -2284,7 +2317,7 @@ msgstr "%s:%d: virheelliset vientivalitsimet\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
@@ -2325,11 +2358,11 @@ msgstr ""
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
@@ -2408,150 +2441,150 @@ msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 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:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -2781,7 +2814,7 @@ msgstr "avain %08lX: uusi avain - ohitetaan\n"
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
@@ -3365,8 +3398,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
@@ -3747,117 +3780,117 @@ msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3865,19 +3898,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:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3885,7 +3918,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:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3894,75 +3927,75 @@ 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, 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:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3972,199 +4005,199 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 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:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 #, 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:3468
+#: g10/keyedit.c:3470
 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:3474
+#: g10/keyedit.c:3476
 #, 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, 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:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, 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:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, 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:4713
+#: g10/keyedit.c:4715
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, 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:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, 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:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, 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:5005
+#: g10/keyedit.c:5007
 #, 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:5100
+#: g10/keyedit.c:5102
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4884,7 +4917,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -5313,11 +5346,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
@@ -5703,12 +5736,12 @@ msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
 msgid "no valid addressees\n"
 msgstr "ei kelvollisia vastaanottajia\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@ -5939,7 +5972,7 @@ msgstr ""
 "heikon avaimen luomista symmetriselle salaimelle ei voitu välttää; \n"
 "yritettiin %d kertaa!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -6055,55 +6088,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:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, 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:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ohitetaan \"%s\": kopio\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -6485,67 +6518,77 @@ msgstr "syöterivi %u on liian pitkä tai rivinvaihto puutuu\n"
 msgid "can't open fd %d: %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "virhe tiedostoa luettaessa"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "rivi on liian pitkä\n"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "virheellinen argumentti"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "ristiriitainen komento\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "ei käsitelty"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "ei käsitelty"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "virheelliset tuontivalitsimet\n"
@@ -6638,12 +6681,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6655,103 +6699,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "muuta salasanaa"
@@ -6759,104 +6803,115 @@ msgstr "muuta salasanaa"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Valitse mitätöinnin syy:\n"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -7216,17 +7271,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7451,7 +7506,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7671,12 +7726,12 @@ msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
 msgid "|N|use compress algorithm N"
 msgstr "|N|käytä pakkausalgoritmia N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7687,60 +7742,60 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = ohita tämä avain\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8223,11 +8278,6 @@ msgstr "julkista avainta ei löydy"
 msgid "No argument allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: 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:152
 #, fuzzy
 msgid ""
diff --git a/po/gl.po b/po/gl.po
index efc8b2d1b..fc43ecea8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -94,20 +94,20 @@ msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -170,22 +170,36 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Introduza o ID de usuario: "
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Repita o contrasinal: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repita o contrasinal: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
+
+#: agent/divert-scd.c:291
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -379,7 +393,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -398,30 +412,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, 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:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
@@ -1114,7 +1128,7 @@ msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
 msgid "not human readable"
 msgstr "non lexible por humanos"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "a chave secreta non est� dispo�ible"
@@ -1124,166 +1138,181 @@ msgstr "a chave secreta non est� dispo�ible"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, 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:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Non se admite este comando no modo %s.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "hai partes da chave secreta non dispo�ibles\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "unspecified"
 msgstr "Non se especificou un motivo"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erro ao crea-lo chaveiro `%s': %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1291,136 +1320,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, 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:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, 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:1241
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispo�ible en: "
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
@@ -1428,12 +1461,12 @@ msgstr "Comando incorrecto (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1483,7 +1516,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -1502,7 +1535,7 @@ msgstr "fallou a sinatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
@@ -1530,7 +1563,7 @@ msgid ""
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1733,7 +1766,7 @@ 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:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1982,7 +2015,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1994,7 +2027,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Cifra: "
 
@@ -2002,11 +2035,11 @@ msgstr "Cifra: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -2014,7 +2047,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
@@ -2163,7 +2196,7 @@ msgstr "%s non � un xogo de caracteres v�lido\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
@@ -2278,7 +2311,7 @@ msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
@@ -2320,11 +2353,11 @@ msgstr ""
 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
@@ -2404,150 +2437,150 @@ msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 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:3355
+#: g10/gpg.c:3346
 #, 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:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 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:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -2775,7 +2808,7 @@ msgstr "chave %08lX: nova chave - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
@@ -3364,8 +3397,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
@@ -3754,117 +3787,117 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3872,19 +3905,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:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3892,7 +3925,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:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3901,77 +3934,77 @@ 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3981,204 +4014,204 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
 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:3474
+#: g10/keyedit.c:3476
 #, 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, 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:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, 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:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 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:4687
+#: g10/keyedit.c:4689
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4896,7 +4929,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
@@ -5320,12 +5353,12 @@ msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 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:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, 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"
@@ -5710,12 +5743,12 @@ msgstr "%s: omitido: a chave p�blica est� desactivada\n"
 msgid "no valid addressees\n"
 msgstr "non hai enderezos v�lidos\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
@@ -5946,7 +5979,7 @@ msgstr ""
 "non se pode evitar unha chave feble para o cifrado sim�trico; tentouse %d "
 "veces\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -6061,53 +6094,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:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, 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:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "om�tese `%s': duplicada\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "om�tese `%s': %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -6493,67 +6526,77 @@ msgstr ""
 msgid "can't open fd %d: %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "erro de lectura de ficheiro"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "li�a longa de m�is\n"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "argumento non v�lido"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "comandos conflictivos\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "non procesado"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "non procesado"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
@@ -6647,12 +6690,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6664,103 +6708,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "cambia-lo contrasinal"
@@ -6768,103 +6812,114 @@ msgstr "cambia-lo contrasinal"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Por favor, escolla o motivo da revocaci�n:\n"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
@@ -7237,17 +7292,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7473,7 +7528,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7693,12 +7748,12 @@ 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"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7709,60 +7764,60 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = omitir esta chave\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8246,11 +8301,6 @@ msgstr "non se atopou a chave p�blica"
 msgid "No argument allowed"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: 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:152
 #, fuzzy
 msgid ""
diff --git a/po/hu.po b/po/hu.po
index 6fdd3bb34..db669daf5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -94,20 +94,20 @@ msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, 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:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -170,21 +170,35 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Ism�telje meg a jelsz�t: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ism�telje meg a jelsz�t: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
+
+#: agent/divert-scd.c:291
 #, 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
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -376,7 +390,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -393,30 +407,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, 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:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
@@ -1104,7 +1118,7 @@ msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
 msgid "not human readable"
 msgstr "nem olvashat� forma"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
@@ -1114,166 +1128,181 @@ msgstr "titkos kulcs nem �ll rendelkez�sre"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, 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:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "unspecified"
 msgstr "Nincs megadva ok."
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 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"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenci�k friss�t�se"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, 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:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1281,136 +1310,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, 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:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, 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:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, 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:1241
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "change the login name"
 msgstr "lej�rat megv�ltoztat�sa"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
@@ -1418,12 +1451,12 @@ msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1472,7 +1505,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -1491,7 +1524,7 @@ msgstr "%s rejtjelez�st haszn�lok.\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
@@ -1517,7 +1550,7 @@ 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:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1718,7 +1751,7 @@ msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1965,7 +1998,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:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1977,7 +2010,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
@@ -1985,11 +2018,11 @@ msgstr "Rejtjelez� (cipher): "
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -1997,7 +2030,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
@@ -2146,7 +2179,7 @@ msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
@@ -2261,7 +2294,7 @@ msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
@@ -2301,11 +2334,11 @@ msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
@@ -2385,150 +2418,150 @@ msgstr ""
 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:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 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:4263
+#: g10/gpg.c:4254
 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:4296
+#: g10/gpg.c:4287
 #, 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"
@@ -2756,7 +2789,7 @@ msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
@@ -3338,8 +3371,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
@@ -3720,117 +3753,117 @@ msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 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:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr "Jel�l�s: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3838,19 +3871,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:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3858,7 +3891,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:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3868,75 +3901,75 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, 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:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3946,199 +3979,199 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 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:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 #, 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:3468
+#: g10/keyedit.c:3470
 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:3474
+#: g10/keyedit.c:3476
 #, 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:3535
+#: g10/keyedit.c:3537
 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:3541
+#: g10/keyedit.c:3543
 #, 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:3545
+#: g10/keyedit.c:3547
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, 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:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 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:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, 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:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 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:4687
+#: g10/keyedit.c:4689
 #, 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:4713
+#: g10/keyedit.c:4715
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, 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:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, 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:5005
+#: g10/keyedit.c:5007
 #, 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:5100
+#: g10/keyedit.c:5102
 #, 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"
@@ -4855,7 +4888,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -5284,12 +5317,12 @@ msgstr ""
 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:796
+#: g10/parse-packet.c:806
 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:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
@@ -5674,12 +5707,12 @@ msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
 msgid "no valid addressees\n"
 msgstr "Nincsenek �rv�nyes c�mzettek!\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
@@ -5909,7 +5942,7 @@ msgstr ""
 "Nem tudom elker�lni a gyenge kulcsot a szimmetrikus titkos�t�hoz.\n"
 "%d alkalommal pr�b�ltam!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -6024,12 +6057,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:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6037,41 +6070,41 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\"-t kihagytam: m�sodp�ld�ny.\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "Kihagytam \"%s\"-t: %s.\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -6453,67 +6486,77 @@ msgstr "A bemeneti sor (%u) t�l hossz�, vagy hi�nyzik a soremel�s.\n"
 msgid "can't open fd %d: %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "�llom�nyolvas�si hiba"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "�rv�nytelen argumentum"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "nem feldolgozott"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "nem feldolgozott"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "�rv�nytelen import opci�k!\n"
@@ -6605,12 +6648,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6622,103 +6666,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "jelsz�v�ltoztat�s"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "jelsz�v�ltoztat�s"
@@ -6726,103 +6770,114 @@ msgstr "jelsz�v�ltoztat�s"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
@@ -7182,17 +7237,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7418,7 +7473,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7638,12 +7693,12 @@ 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"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, 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:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7654,60 +7709,60 @@ 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"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " h = kulcs kihagy�sa\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, 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:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8190,11 +8245,6 @@ msgstr "nyilv�nos kulcs nem tal�lhat�"
 msgid "No argument allowed"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: 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:152
 #, fuzzy
 msgid ""
diff --git a/po/id.po b/po/id.po
index 44615e39b..920292dc5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -96,20 +96,20 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -172,21 +172,35 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Ulangi passphrase: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ulangi passphrase: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "passphrase tidak diulang dengan benar; coba lagi"
+
+#: agent/divert-scd.c:291
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -378,7 +392,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -395,30 +409,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
@@ -1107,7 +1121,7 @@ msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 msgid "not human readable"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
@@ -1117,166 +1131,181 @@ msgstr "kunci rahasia tidak tersedia"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "bagian kunci rahasia tidak tersedia\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "unspecified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1284,136 +1313,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
@@ -1421,12 +1454,12 @@ msgstr "Perintah tidak valid (coba \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1475,7 +1508,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -1494,7 +1527,7 @@ msgstr "menggunakan cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
@@ -1522,7 +1555,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1721,7 +1754,7 @@ msgstr "tampilkan fingerprint"
 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:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
@@ -1967,7 +2000,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1979,7 +2012,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Cipher: "
 
@@ -1987,11 +2020,11 @@ msgstr "Cipher: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -1999,7 +2032,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
@@ -2148,7 +2181,7 @@ msgstr "%s bukanlah set karakter yang valid\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
@@ -2263,7 +2296,7 @@ msgstr "%s:%d: opsi ekspor tidak valid\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
@@ -2309,11 +2342,11 @@ msgstr ""
 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
@@ -2394,151 +2427,151 @@ 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:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -2766,7 +2799,7 @@ msgstr "kunci %08lX: kunci baru - dilewati\n"
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
@@ -3349,8 +3382,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -3731,117 +3764,117 @@ msgstr "Perbarui preferensi untuk user ID terpilih?"
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2728
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3849,19 +3882,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3869,7 +3902,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:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3879,75 +3912,75 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3957,202 +3990,202 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 #, 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:3468
+#: g10/keyedit.c:3470
 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:3474
+#: g10/keyedit.c:3476
 #, 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, 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:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, 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:4713
+#: g10/keyedit.c:4715
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, 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"
@@ -4865,7 +4898,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -5284,11 +5317,11 @@ msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -5670,12 +5703,12 @@ msgstr "%s: dilewati: kunci publik dimatikan\n"
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
@@ -5904,7 +5937,7 @@ 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:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -6019,54 +6052,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:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, 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:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "lewati `%s': terduplikasi\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -6447,67 +6480,77 @@ msgstr "baris input %u terlalu panjang atau hilang LF\n"
 msgid "can't open fd %d: %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "kesalahan baca file"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "baris terlalu panjang\n"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "argumen tidak valid"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "perintah saling konflik\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "opsi impor tidak valid\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "tidak diproses"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "opsi impor tidak valid\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "tidak diproses"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opsi impor tidak valid\n"
@@ -6599,12 +6642,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6616,103 +6660,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "ubah passphrase"
@@ -6720,103 +6764,114 @@ msgstr "ubah passphrase"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Silakan pilih alasan untuk pembatalan:\n"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -7176,17 +7231,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7412,7 +7467,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7632,12 +7687,12 @@ msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7648,60 +7703,60 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = lewati kunci ini\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8184,11 +8239,6 @@ msgstr "kunci publik tidak ditemukan"
 msgid "No argument allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: 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:152
 #, fuzzy
 msgid ""
diff --git a/po/it.po b/po/it.po
index 861240ebf..23b5d56e3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+0200\n"
 "PO-Revision-Date: 2008-05-26 12:02+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -94,20 +94,20 @@ msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -170,21 +170,35 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Ripeti la passphrase: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ripeti la passphrase: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "passphrase non ripetuta correttamente; prova ancora"
+
+#: agent/divert-scd.c:291
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -376,7 +390,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -393,30 +407,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, 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:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
@@ -1105,7 +1119,7 @@ msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 msgid "not human readable"
 msgstr "non leggibile"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la chiave segreta non � disponibile"
@@ -1115,167 +1129,182 @@ msgstr "la chiave segreta non � disponibile"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Questo comando non � permesso in modalit� %s.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "parti della chiave segreta non sono disponibili\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 #, fuzzy
 msgid "male"
 msgstr "abilita"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "female"
 msgstr "abilita"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "unspecified"
 msgstr "Nessuna ragione specificata"
 
 # ??? (Md)
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 #, fuzzy
 msgid "not forced"
 msgstr "non esaminato"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "errore creando il portachiavi `%s': %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenze aggiornate"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1283,136 +1312,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, 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:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "Chiave disponibile presso: "
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia la data di scadenza"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia il valore di fiducia"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
@@ -1420,12 +1453,12 @@ msgstr "Comando non valido  (prova \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1474,7 +1507,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -1494,7 +1527,7 @@ msgstr "uso il cifrario %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
@@ -1525,7 +1558,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1729,7 +1762,7 @@ msgstr "mostra le impronte digitali"
 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:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1976,7 +2009,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1988,7 +2021,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Cifrari: "
 
@@ -1996,11 +2029,11 @@ msgstr "Cifrari: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -2008,7 +2041,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
@@ -2158,7 +2191,7 @@ msgstr "%s non � un set di caratteri valido\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
@@ -2273,7 +2306,7 @@ msgstr "%s:%d: opzioni di esportazione non valide\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
@@ -2315,11 +2348,11 @@ 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
@@ -2398,151 +2431,151 @@ 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:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -2770,7 +2803,7 @@ msgstr "chiave %08lX: nuova chiave - saltata\n"
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
@@ -3354,8 +3387,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -3736,117 +3769,117 @@ msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3855,19 +3888,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3876,7 +3909,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3885,76 +3918,76 @@ 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3964,207 +3997,207 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 #, 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:3468
+#: g10/keyedit.c:3470
 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:3474
+#: g10/keyedit.c:3476
 #, 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, 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:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, 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:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, 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:4713
+#: g10/keyedit.c:4715
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4884,7 +4917,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -5306,13 +5339,13 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 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:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -5697,12 +5730,12 @@ msgstr "%s: saltata: chiave pubblica disabilitata\n"
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chiave %08lX: nessun user ID\n"
@@ -5937,7 +5970,7 @@ msgstr ""
 "Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
 "ho provato %d volte!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -6062,54 +6095,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:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, 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:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "saltata `%s': doppia\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -6491,67 +6524,79 @@ msgstr "linea di input %u troppo lunga o LF mancante\n"
 msgid "can't open fd %d: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "errore durante la lettura del file"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "riga troppo lunga\n"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "argomento non valido"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "comandi in conflitto\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "opzioni di importazione non valide\n"
 
-#: jnlib/argparse.c:188
+# ??? (Md)
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "non esaminato"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "opzioni di importazione non valide\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+# ??? (Md)
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "non esaminato"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opzioni di importazione non valide\n"
@@ -6643,12 +6688,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6660,103 +6706,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "cambia la passphrase"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "cambia la passphrase"
@@ -6764,103 +6810,114 @@ msgstr "cambia la passphrase"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Per favore scegli il motivo della revoca:\n"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera una nuova coppia di chiavi"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@ -7220,17 +7277,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7455,7 +7512,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7675,12 +7732,12 @@ msgstr "|NOME|usa l'algoritmo di message digest NOME"
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7691,60 +7748,60 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = salta questa chiave\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8227,11 +8284,6 @@ msgstr "chiave pubblica non trovata"
 msgid "No argument allowed"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: 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:152
 #, fuzzy
 msgid ""
diff --git a/po/ja.po b/po/ja.po
index db220982e..cc53afe7e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -98,20 +98,20 @@ msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -174,21 +174,35 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|Admin PIN"
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "PIN�������: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "PIN�������: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
+
+#: agent/divert-scd.c:291
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, fuzzy, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "PIN [��̾��: %lu]"
@@ -380,7 +394,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -397,30 +411,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
@@ -1106,7 +1120,7 @@ msgstr "�ٹ�: ̵��������ǡ�����ȯ��\n"
 msgid "not human readable"
 msgstr "�ͤˤ��ɤ�ޤ���"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
@@ -1116,153 +1130,168 @@ msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "��̩��ʬ�������ޤ���\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "�����? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr "[̤����]"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr "��"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr "��"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr "̵����"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "not forced"
 msgstr "̤����"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr "����"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "���顼�� �Τ٤����ASCII�������������Ĥ���Ƥ��ޤ���\n"
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "���顼: ��<��ʸ���ϻȤ��ޤ���\n"
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "���顼: ��Ťζ���϶ػߤǤ���\n"
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr "�����ɽ�ͭ�Ԥ��� (surname): "
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr "�����ɽ�ͭ�Ԥ�̾ (given name): "
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "���顼: �Ĥʤ���̾����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 msgid "URL to retrieve public key: "
 msgstr "��������õ������URL: "
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "���ء�%s�פκ������顼: %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr "�������󡦥ǡ��� (���������̾): "
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "���顼: �������󡦥ǡ�����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 msgid "Language preferences: "
 msgstr "���������: "
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 msgid "Error: invalid length of preference string.\n"
 msgstr "���顼: ����ʸ�����Ĺ����̵���Ǥ���\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 msgid "Error: invalid characters in preference string.\n"
 msgstr "���顼: ����ʸ�����̵����ʸ��������ޤ���\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "���� ((M)�ˡ�(F)��������): "
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 msgid "Error: invalid response.\n"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 msgid "CA fingerprint: "
 msgstr "CA���: "
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "���顼: ̵���ʷ����λ��档\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "�������Ǥ��ޤ���: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 msgid "not an OpenPGP card"
 msgstr "OpenPGP�����ɤǤ���ޤ���"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr "��¸�θ���򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "�Ź渰�򥫡��ɳ��˥Хå����åפ��ޤ���? (Y/n) "
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr "��¸�θ�����򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1273,120 +1302,124 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "���Υ��ޥ�ɤ�Ȥä��ѹ����٤��Ǥ� --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 msgid "Please select the type of key to generate:\n"
 msgstr "�������븰�η������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 msgid "   (1) Signature key\n"
 msgstr "   (1) ��̾��\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �Ź沽��\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 msgid "Please select where to store the key:\n"
 msgstr "�����ݴɾ������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 msgid "unknown key protection algorithm\n"
 msgstr "̤�Τθ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 msgid "secret parts of key are not available\n"
 msgstr "������̩��ʬ��̵���Ǥ�\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 msgid "list all available data"
 msgstr "��ͭ���ǡ�����ɽ��"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr "�����ɽ�ͭ�Ԥ�̾�����ѹ�"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr "����õ������URL���ѹ�"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr "������URL�ǻ��ꤵ�줿���ΰ����Ф�"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 msgid "change the login name"
 msgstr "��������̾���ѹ�"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 msgid "change the language preferences"
 msgstr "�����������ѹ�"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr "�����ɽ�ͭ�Ԥ����̤��ѹ�"
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 msgid "change a CA fingerprint"
 msgstr "CA������ѹ�"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr "��̾����PIN�ե饰��ȿž"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 msgid "generate new keys"
 msgstr "����������������"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 msgid "Admin-only command\n"
 msgstr "�������ѥ��ޥ��\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 msgid "Admin commands are allowed\n"
 msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
@@ -1394,12 +1427,12 @@ msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1445,7 +1478,7 @@ msgstr "���θ������ˤ���������̩����%s�ɤ�����ޤ�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ɥ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -1464,7 +1497,7 @@ msgstr "%s�Ź�ˡ��Ȥ��ޤ�\n"
 msgid "`%s' already compressed\n"
 msgstr "��%s�פϤ⤦���̺ѤߤǤ�\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: ��%s�פ϶��Υե�����Ǥ�\n"
@@ -1489,7 +1522,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: �оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1681,7 +1714,7 @@ msgstr "CA���: "
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
@@ -1931,7 +1964,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1943,7 +1976,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
@@ -1951,11 +1984,11 @@ msgstr "�Ź�ˡ: "
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -1963,7 +1996,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
@@ -2112,7 +2145,7 @@ msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
@@ -2223,7 +2256,7 @@ msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
@@ -2263,11 +2296,11 @@ msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
@@ -2343,147 +2376,147 @@ msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -2713,7 +2746,7 @@ msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
@@ -3261,8 +3294,8 @@ msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
@@ -3634,45 +3667,45 @@ msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 msgid "Save changes? (y/N) "
 msgstr "�ѹ�����¸���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 msgid "Quit without saving? (y/N) "
 msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr "������������: "
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3680,71 +3713,71 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2699
+#: g10/keyedit.c:2701
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2720
+#: g10/keyedit.c:2722
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3752,17 +3785,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3770,7 +3803,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3779,75 +3812,75 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3856,191 +3889,191 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3427
+#: g10/keyedit.c:3429
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3449
+#: g10/keyedit.c:3451
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3476
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "��̾����: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4943
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
@@ -4737,7 +4770,7 @@ msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
 msgid "keyserver did not send VERSION\n"
 msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
 
@@ -5151,11 +5184,11 @@ msgstr "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
@@ -5516,12 +5549,12 @@ msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n"
 msgid "no valid addressees\n"
 msgstr "ͭ���ʰ��褬����ޤ���\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "��%s�ˤϥ桼����ID������ޤ���\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "��%s�ˤϥ桼����ID������ޤ���\n"
@@ -5745,7 +5778,7 @@ msgstr "�夤�����Ǥ��ޤ��� - �Ƽ¹�\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -5848,50 +5881,50 @@ msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s��̾����̾��:��%s��\n"
 
-#: g10/sign.c:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "���ݤǤ���Ȥ����ե饰�����ˤ����ꤵ��Ƥ��ޤ���\n"
 "��ʪ��������ҤȤϤ��ä���˻Ȥ��ޤ���!\n"
 
-#: g10/skclist.c:180
+#: g10/skclist.c:169
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "��%s�ɤ�ȤФ��ޤ�: ��ʣ\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "��%s�ɤ�ȤФ��ޤ�: %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "�����å�: ��̩���Ϥ⤦����ޤ�\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "�����PGP����������Elgamal���ǡ���̾�Ѥˤϰ����ǤϤ���ޤ���!"
 
@@ -6270,67 +6303,77 @@ msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
 msgid "can't open fd %d: %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "�ե�������ɽФ����顼"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "̵���ʻ���Ǥ�"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "�������ѥ��ޥ��\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "̤����"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "̤����"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
@@ -6422,12 +6465,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
@@ -6439,104 +6483,104 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 #, fuzzy
 msgid "|N|New PIN"
 msgstr "������PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "PIN [��̾��: %lu]"
@@ -6544,99 +6588,110 @@ msgstr "PIN [��̾��: %lu]"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
-#. 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "PIN [��̾��: %lu]"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "|A|������Admin PIN"
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 msgid "error reading application data\n"
 msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 msgid "error reading fingerprint DO\n"
 msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 msgid "key already exists\n"
 msgstr "���Ϥ⤦����ޤ�\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 msgid "generating new key\n"
 msgstr "��������������\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr "�������δ֡����Ԥ��������� ...\n"
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 msgid "generating key failed\n"
 msgstr "���������˼��Ԥ��ޤ���\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "������������λ���ޤ��� (%d��)\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
@@ -6996,17 +7051,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7232,7 +7287,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7460,12 +7515,12 @@ msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 msgid "|N|use compress algorithm N"
 msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7476,60 +7531,60 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = ���θ��ϤȤФ�\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8009,11 +8064,6 @@ msgstr "�����������Ĥ���ޤ���"
 msgid "No argument allowed"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: tools/no-libgcrypt.c:30
-#, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "���ء�%s�פκ������顼: %s\n"
-
 #: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
diff --git a/po/nb.po b/po/nb.po
index 9189690a6..cb6b662a5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -98,20 +98,20 @@ msgstr ""
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
@@ -174,21 +174,35 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|Admin PIN"
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Gjenta denne PIN: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Gjenta denne PIN: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
+
+#: agent/divert-scd.c:291
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, 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]"
@@ -380,7 +394,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -397,30 +411,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
@@ -1094,7 +1108,7 @@ msgstr "ingen gyldig OpenPGP-data funnet.\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
@@ -1104,153 +1118,167 @@ msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnummer %s oppdaget\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "kan ikke gj�re dette i batchmodus\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+msgid "Reset Code not or not anymore available\n"
+msgstr ""
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Ditt valg? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr "[ikke satt]"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr "mann"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr "dame"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr "uspesifisert"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Feil: Bare ren ASCII er forel�pig tillatt.\n"
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Feil: Tegnet �<� kan ikke brukes.\n"
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr "Kortholders etternavn: "
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, 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:585
+#: g10/card-util.c:636
 msgid "URL to retrieve public key: "
 msgstr "URL for � hente offentlig n�kkel: "
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, 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:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 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"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr "Logindata (kontonavn): "
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, 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:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, 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:798
+#: g10/card-util.c:884
 msgid "Language preferences: "
 msgstr "Spr�kpreferanser:"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 msgid "Error: invalid length of preference string.\n"
 msgstr "Feil: ugyldig lengde p� preferansestrengen.\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Feil: ugyldig tegn i preferansestrengen.\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kj�nn ((M)ale, (F)emale eller mellomrom): "
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 msgid "Error: invalid response.\n"
 msgstr "Feil: ugyldig respons.\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtrykk: "
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "n�kkeloperasjonen er umulig: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, 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:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr "Erstatte eksisterende n�kkel? (j/N) "
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Lage sikkerhetskopi av krypteringsn�kler utenfor kortet? (J/n) "
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstatte eksisterende n�kler? (j/N) "
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1261,120 +1289,124 @@ msgstr ""
 "   PIN = �%s�     Admin PIN = �%s�\n"
 "Du b�r endre dem med kommandoen --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 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:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signaturn�kkel\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsn�kkel\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsn�kkel\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 msgid "Please select where to store the key:\n"
 msgstr "Vennligst velg hvor n�kkelen skal lagres:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 msgid "unknown key protection algorithm\n"
 msgstr "ukjent n�kkelbeskyttelsesalgoritme\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 msgid "secret parts of key are not available\n"
 msgstr "hemmelige deler av n�kkelen er ikke tilgjengelig.\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 msgid "secret key already stored on a card\n"
 msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "avslutte denne menyen"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 msgid "show admin commands"
 msgstr "vise admin-kommandoer"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "vise denne hjelpen"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 msgid "list all available data"
 msgstr "vis alle tilgjengelige data"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr "endre kortholders navn"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr "endre URL for � hente n�kkel"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 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:1320
+#: g10/card-util.c:1407
 msgid "change the login name"
 msgstr "endre loginnavnet"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 msgid "change the language preferences"
 msgstr "endre spr�kpreferansene"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr "endre kortholders kj�nn"
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 msgid "change a CA fingerprint"
 msgstr "vise et CA-fingeravtrykk"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr "veksle tving-signatur-PIN-flagget"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 msgid "generate new keys"
 msgstr "generere nye n�kler"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr "meny for � endre eller fjerne blokkering av PIN"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 msgid "Admin-only command\n"
 msgstr "Admin-reservert kommando\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 msgid "Admin commands are allowed\n"
 msgstr "Admin-kommandoer er tillatt\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (pr�v �help�)\n"
 
@@ -1382,12 +1414,12 @@ msgstr "Ugyldig kommando  (pr�v �help�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1433,7 +1465,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
@@ -1452,7 +1484,7 @@ msgstr "bruker cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "�%s� er allerede komprimert\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: �%s� er en tom fil\n"
@@ -1482,7 +1514,7 @@ msgstr ""
 "ADVARSEL: p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1675,7 +1707,7 @@ msgstr "CA-fingeravtrykk: "
 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:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemmelig undern�kkel for offentlig undern�kkel %s - ignorerer\n"
@@ -1920,7 +1952,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1932,7 +1964,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Offentlig n�kkel: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Cipher: "
 
@@ -1940,11 +1972,11 @@ msgstr "Cipher: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Kompresjon: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -1952,7 +1984,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
@@ -2107,7 +2139,7 @@ msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
@@ -2214,7 +2246,7 @@ msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
@@ -2254,11 +2286,11 @@ msgstr "du m� bruke filer (og ikke en pipe) n�r --pgp2 er p�sl�tt\n"
 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
@@ -2334,148 +2366,148 @@ msgstr "du kan ikke bruke digestalgoritmen �%s� i %s-modus\n"
 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:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
@@ -2699,7 +2731,7 @@ msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
 msgid "no writable keyring found: %s\n"
 msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til �%s�\n"
@@ -3244,8 +3276,8 @@ msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
 msgid "Really sign? (y/N) "
 msgstr "Virkelig signere? (j/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
@@ -3584,398 +3616,398 @@ msgstr "Virkelig oppdatere preferansene for de valgte brukeridene? (j/N) "
 msgid "Really update the preferences? (y/N) "
 msgstr "Virkelig oppdatere preferansene? (j/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 msgid "Save changes? (y/N) "
 msgstr "Lagre endringene? (j/N) "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 msgid "Quit without saving? (y/N) "
 msgstr "Avslutte uten � lagre? (j/N) "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 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:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "S�rtrekk: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "utg�r: %s"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, c-format
 msgid "usage: %s"
 msgstr "bruksm�te: %s"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Denne n�kkelen har blitt utkoblet"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "utg�tt"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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:3021
+#: g10/keyedit.c:3023
 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 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:3032
+#: g10/keyedit.c:3034
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettet %d signatur.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 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:3367
+#: g10/keyedit.c:3369
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3427
+#: g10/keyedit.c:3429
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3449
+#: g10/keyedit.c:3451
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3476
 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 msgid "Please select at most one subkey.\n"
 msgstr "Vennligst velg minst en undern�kkel.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
 
-#: g10/keyedit.c:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 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:4148
+#: g10/keyedit.c:4150
 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:4210
+#: g10/keyedit.c:4212
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk den %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 msgid " (non-revocable)"
 msgstr " (ikke-opphevbar)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "ingen hemmelig n�kkel\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "brukerid �%s� er allerede opphevet\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�kkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4683,7 +4715,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr "n�kkelserver sendte ikke VERSION\n"
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -5097,11 +5129,11 @@ msgstr "ADVARSEL: valgene i �%s� er ikke aktive under denne kj�ringen\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -5467,12 +5499,12 @@ msgstr "%s: hoppet over: offentlig n�kkel er utkoblet\n"
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adressater\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "n�kkel %s: ingen brukerid\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "n�kkel %s: ingen brukerid\n"
@@ -5690,7 +5722,7 @@ msgstr ""
 "kan ikke unng� svak n�kkel for symmetrisk krypteringsalgorime; pr�vde %d "
 "ganger!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -5799,11 +5831,11 @@ msgstr ""
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s-signatur fra: �%s�\n"
 
-#: g10/sign.c:760
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5811,38 +5843,38 @@ msgstr ""
 "ADVARSEL: p�tvinging av kompresjonsalgoritme %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:180
+#: g10/skclist.c:169
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppet over �%s�: er duplikat\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppet over �%s�: %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr ""
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
@@ -6208,67 +6240,77 @@ msgstr ""
 msgid "can't open fd %d: %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "feil ved lesing av fil"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "for lang linje"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "ugydig argument"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "Admin-reservert kommando\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "ugyldige listevalg\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "ikke tvunget"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "ugyldige listevalg\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Ugyldig kommando  (pr�v �help�)\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "ikke tvunget"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "ugyldige listevalg\n"
@@ -6360,12 +6402,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
@@ -6377,103 +6420,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr "respons inneholder ikke data om offentlig n�kkel\n"
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr "respons inneholder ikke RSA-modulus\n"
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, 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"
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr "feil ved henting av CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent l�st!\n"
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, 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"
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
@@ -6481,98 +6524,109 @@ msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
-#. 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN"
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 msgid "error reading application data\n"
 msgstr "feil ved lesing av applikasjonsdata\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 msgid "error reading fingerprint DO\n"
 msgstr "feil ved lesing av fingeravtrykk DO\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 msgid "key already exists\n"
 msgstr "n�kkel finnes allerede\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr "eksisterende n�kkel vil bli erstattet\n"
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 msgid "generating new key\n"
 msgstr "generere en ny n�kkel\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr "tidsstempel for opprettelse mangler\n"
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, 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"
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, 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"
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, 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"
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr "vennligst vent mens n�kkel blir generert ...\n"
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 msgid "generating key failed\n"
 msgstr "n�kkelgenerering mislyktes\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "n�kkelgenerering fullf�rt (%d sekunder)\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet st�tter ikke digestalgoritme %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet s� langt: %lu\n"
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 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"
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
@@ -6928,17 +6982,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7165,7 +7219,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7392,12 +7446,12 @@ msgstr "%s signatur, digestalgoritme %s\n"
 msgid "|N|use compress algorithm N"
 msgstr "ukjent kompresjonsalgoritme"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7408,60 +7462,60 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = hopp over denne n�kkelen\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7940,11 +7994,6 @@ msgstr "fant ikke offentlig n�kkel"
 msgid "No argument allowed"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: 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:152
 #, fuzzy
 msgid ""
diff --git a/po/pl.po b/po/pl.po
index 3f7d10a46..0b5549c56 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.7\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+0200\n"
 "PO-Revision-Date: 2007-11-26 19:01+0100\n"
 "Last-Translator: Jakub Bogusz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -94,20 +94,20 @@ msgstr "klucze ssh wi�ksze ni� %d bit�w nie s� obs�ugiwane\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -171,19 +171,33 @@ msgstr "nie pasuj� - prosz� spr�bowa� jeszcze raz"
 msgid "failed to create stream from socket: %s\n"
 msgstr "nie uda�o si� utworzy� strumienia z gniazda: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr "PIN administratora"
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Powt�rz ten PIN"
+
+#: agent/divert-scd.c:285
 msgid "Repeat this PIN"
 msgstr "Powt�rz ten PIN"
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "PIN nie powt�rzony poprawnie; spr�buj jeszcze raz"
+
+#: agent/divert-scd.c:291
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nie powt�rzony poprawnie; spr�buj jeszcze raz"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Prosz� wprowadzi� PIN%s%s%s aby odblokowa� kart�"
@@ -381,7 +395,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|PLIK|zapis ustawie� �rodowiska tak�e do PLIKU"
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "B��dy prosimy zg�asza� na adres <"
@@ -398,30 +412,30 @@ msgstr ""
 "Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
 "Zarz�dzanie kluczem tajnym dla GnuPG\n"
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "podano b��dny poziom diagnostyki ,,%s''\n"
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
@@ -1107,7 +1121,7 @@ msgstr "OSTRZE�ENIE: napotkano b��dne dane adnotacji\n"
 msgid "not human readable"
 msgstr "nieczytelne dla cz�owieka"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Karta OpenPGP niedost�pna: %s\n"
@@ -1117,153 +1131,168 @@ msgstr "Karta OpenPGP niedost�pna: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Wykryto kart� OpenPGP nr %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "tajne cz�ci klucza s� niedost�pne\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr "[nie ustawiono]"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr "m�czyzna"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr "kobieta"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr "nie podano"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "not forced"
 msgstr "nie wymuszono"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr "wymuszono"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "B��d: aktualnie dopuszczalne jest tylko czyste ASCII.\n"
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "B��d: znak ,,<'' nie mo�e by� u�yty.\n"
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "B��d: podw�jne spacje nie s� dopuszczalne.\n"
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr "Nazwisko posiadacza karty: "
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr "Imi� posiadacza karty: "
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "B��d: pe�ne personalia zbyt d�ugie (limit to %d znak�w).\n"
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 msgid "URL to retrieve public key: "
 msgstr "URL do odczytania klucza publicznego: "
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "B��d: URL zbyt d�ugi (limit to %d znak�w).\n"
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "b��d przydzielania wystarczaj�cej ilo�ci pami�ci: %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr "Dane logowania (nazwa konta): "
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "B��d: dane logowania zbyt d�ugie (limit to %d znak�w).\n"
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr "Prywatne dane DO: "
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "B��d: prywatne DO zbyt d�ugie (limit to %d znak�w).\n"
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 msgid "Language preferences: "
 msgstr "Preferowane j�zyki: "
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 msgid "Error: invalid length of preference string.\n"
 msgstr "B��d: niew�a�ciwa d�ugo�� tekstu preferencji.\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 msgid "Error: invalid characters in preference string.\n"
 msgstr "B��d: niew�a�ciwe znaki w tek�cie preferencji.\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "P�e� (M - m�czyzna, F - kobieta lub spacja): "
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 msgid "Error: invalid response.\n"
 msgstr "B��d: niew�a�ciwa odpowied�.\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 msgid "CA fingerprint: "
 msgstr "Odcisk CA:"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "B��d: niew�a�ciwie sformatowany odcisk.\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operacja na kluczu niewykonalna: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 msgid "not an OpenPGP card"
 msgstr "to nie jest karta OpenPGP"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "b��d podczas odczytu aktualnych informacji o kluczu: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr "Zast�pi� istniej�cy klucz? (t/N) "
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Stworzy� poza kart� kopi� zapasow� klucza szyfruj�cego? (T/n) "
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr "Zast�pi� istniej�ce klucze? (t/N) "
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1274,120 +1303,124 @@ msgstr ""
 "   PIN = ,,%s''   PIN administratora = ,,%s''\n"
 "Nale�y je zmieni� przy u�yciu polecenia --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosz� wybra� rodzaj klucza do wygenerowania:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 msgid "   (1) Signature key\n"
 msgstr "   (1) Klucz do podpis�w\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Klucz do szyfrowania\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Klucz do uwierzytelniania\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 msgid "Please select where to store the key:\n"
 msgstr "Prosz� wybra� gdzie zapisa� klucz:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 msgid "unknown key protection algorithm\n"
 msgstr "nieznany algorytm ochrony klucza\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 msgid "secret parts of key are not available\n"
 msgstr "cz�ci tajne klucza s� niedost�pne\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 msgid "secret key already stored on a card\n"
 msgstr "klucz prywatny jest ju� zapisany na karcie\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 msgid "show admin commands"
 msgstr "pokazanie polece� administratora"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 msgid "list all available data"
 msgstr "wypisanie wszystkich dost�pnych danych"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr "zmiana nazwy posiadacza karty"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr "zmiana URL-a do odczytu klucza"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr "pobranie klucza okre�lonego w URL-u karty"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 msgid "change the login name"
 msgstr "zmiana nazwy logowania"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 msgid "change the language preferences"
 msgstr "zmiana preferowanych j�zyk�w"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr "zmiana p�ci posiadacza karty"
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 msgid "change a CA fingerprint"
 msgstr "zmiana odcisku CA"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr "zmiana flagi wymuszenia PIN-u do podpisu"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 msgid "generate new keys"
 msgstr "wygenerowanie nowych kluczy"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr "menu do zmiany lub odblokowania PIN-u"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr "sprawdzenie PIN-u i wypisanie wszystkich danych"
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 msgid "Admin-only command\n"
 msgstr "Polecenie tylko dla administratora\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 msgid "Admin commands are allowed\n"
 msgstr "Polecenia dla administratora s� dozwolone\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 msgid "Admin commands are not allowed\n"
 msgstr "Polecenia dla administratora nie s� dozwolone\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawne polecenie  (spr�buj ,,help'')\n"
 
@@ -1395,12 +1428,12 @@ msgstr "Niepoprawne polecenie  (spr�buj ,,help'')\n"
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1446,7 +1479,7 @@ msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nale�y najpierw u�y� opcji \"--delete-secret-key\".\n"
 
-#: g10/encode.c:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
@@ -1466,7 +1499,7 @@ msgstr "szyfrem %s\n"
 msgid "`%s' already compressed\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
@@ -1495,7 +1528,7 @@ msgstr ""
 "OSTRZE�ENIE: wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami "
 "adresata\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1687,7 +1720,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %s.\n"
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %s - pomini�ty\n"
@@ -1934,7 +1967,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1946,7 +1979,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
@@ -1954,11 +1987,11 @@ msgstr "Symetryczne: "
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -1966,7 +1999,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
@@ -2129,7 +2162,7 @@ msgstr ",,%s'' nie jest poprawnym czasem wyga�ni�cia podpisu\n"
 msgid "`%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozumia�y URL serwera kluczy\n"
 
@@ -2239,7 +2272,7 @@ msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
 msgid "invalid auto-key-locate list\n"
 msgstr "Niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
@@ -2281,11 +2314,11 @@ msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
@@ -2363,147 +2396,147 @@ msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 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:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "szyfrowanie symetryczne ,,%s'' nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [plik]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nie mo�na u�y� --symmetric --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nie mo�na u�y� --symmetric --encrypt w trybie %s\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [plik]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nie mo�na u�y� --symmetric --sign --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nie mo�na u�y� --symmetric --sign --encrypt w trybie %s\n"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
 
@@ -2730,7 +2763,7 @@ msgstr "klucz %s: nowy klucz - pomini�ty\n"
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do ,,%s''\n"
@@ -3290,8 +3323,8 @@ msgstr "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
@@ -3659,113 +3692,113 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno uaktualni� ustawienia? (t/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 msgid "Save changes? (y/N) "
 msgstr "Zapisa� zmiany? (t/N) "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj�� bez zapisania zmian? (t/N) "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 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:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr "no-modify dla serwera kluczy"
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr "Preferowany serwer kluczy: "
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 msgid "Notations: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Ten klucz zosta� uniewa�niony %s przez klucz %s u�ytkownika %s\n"
 
-#: g10/keyedit.c:2720
+#: g10/keyedit.c:2722
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s u�ytkownika %s"
 
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr "(poufne)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "utworzono: %s"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "uniewa�niono: %s"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, c-format
 msgid "expired: %s"
 msgstr "wygas�: %s"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "wygasa: %s"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, c-format
 msgid "usage: %s"
 msgstr "u�ycie: %s"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, c-format
 msgid "trust: %s"
 msgstr "zaufanie: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr "poprawno��: %s"
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr "nr-karty: "
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3773,17 +3806,17 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "uniewa�niony"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "wygas�"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3792,7 +3825,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:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3801,74 +3834,74 @@ 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' upakowany: %s\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': %d podpis�w wyczyszczonych\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': ju� zmniejszony.\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': ju� czysty.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3878,191 +3911,191 @@ msgstr ""
 "             uniewa�niaj�cego spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie mo�na wyznaczy� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:3449
+#: g10/keyedit.c:3451
 msgid "this key has already been designated as a revoker\n"
 msgstr "ten klucz zosta� ju� uznany kluczem uniewa�niaj�cym\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
 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:3474
+#: g10/keyedit.c:3476
 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "podklucz podpisuj�cy %s jest ju� skro�nie podpisany\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "podklucz %s nie jest podpisuj�cy, wi�c nie musi by� skro�nie podpisany\n"
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr "Podaj preferowany URL serwera kluczy: "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz go zast�pi�? (t/N) "
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz go usun��? (t/N) "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 msgid "Enter the notation: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 msgid "Proceed? (y/N) "
 msgstr "Kontynuowa�? (t/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u�ytkownika o skr�cie %s\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak podklucza o numerze %d.\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identyfikator u�ytkownika: ,,%s''\n"
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany twoim kluczem %s w %s%s%s\n"
 
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory na kluczu %s s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 msgid " (non-revocable)"
 msgstr " (podpis nieuniewa�nialny) "
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez tw�j klucz %s w %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klucz %s jest ju� uniewa�niony.\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklucz %s jest ju� uniewa�niony.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4776,7 +4809,7 @@ msgstr "OSTRZE�ENIE: modu� obs�ugi serwera kluczy z innej wersji GnuPG (%s)\n"
 msgid "keyserver did not send VERSION\n"
 msgstr "serwer kluczy nie wys�a� VERSION\n"
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
@@ -5195,13 +5228,13 @@ msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 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:796
+#: g10/parse-packet.c:806
 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:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -5571,12 +5604,12 @@ msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ytku\n"
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresat�w\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Uwaga: klucz %s nie ma cechy %s\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Uwaga: klucz %s nie ma preferencji dla %s\n"
@@ -5808,7 +5841,7 @@ msgstr ""
 "brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
 "operacja by�a powtarzana %d razy!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA wymaga d�ugo�ci skr�tu b�d�cego wielokrotno�ci� 8 bit�w\n"
 
@@ -5924,13 +5957,13 @@ msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "podpis %s/%s z�o�ony przez: ,,%s''\n"
 
-#: g10/sign.c:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5938,40 +5971,40 @@ msgstr ""
 "OSTRZE�ENIE: wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami "
 "adresata\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "pomini�ty ,,%s'': duplikat\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "pomini�ty ,,%s'': %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "klucz algorytmu Elgamala wygenerowany przez PGP nie zapewniaj�cy "
@@ -6350,60 +6383,70 @@ msgstr "linia wej�cia %u zbyt d�uga lub brak znaku LF\n"
 msgid "can't open fd %d: %s\n"
 msgstr "nie mo�na otworzy� fd %d: %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 msgid "argument not expected"
 msgstr "nieoczekiwany argument"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 msgid "read error"
 msgstr "b��d odczytu"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 msgid "keyword too long"
 msgstr "s�owo kluczowe zbyt d�ugie"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 msgid "missing argument"
 msgstr "brak argumentu"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 msgid "invalid command"
 msgstr "b��dne polecenie"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 msgid "invalid alias definition"
 msgstr "b��dna definicja aliasu"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "[B��d - brak pami�ci]"
+
+#: jnlib/argparse.c:191
 msgid "invalid option"
 msgstr "b��dna opcja"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "brak argumentu dla opcji ,,%.50s''\n"
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "opcja ,,%.50s'' nie mo�e mie� argument�w\n"
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "b��dne polecenie ,,%.50s''\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "opcja ,,%.50s'' jest niejednoznaczna\n"
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "polecenie ,,%.50s'' jest niejednoznaczne\n"
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "[B��d - brak pami�ci]"
+
+#: jnlib/argparse.c:212
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "b��dna opcja ,,%.50s''\n"
@@ -6495,12 +6538,13 @@ msgstr ""
 "Sk�adnia: kbxutil [opcje] [pliki]\n"
 "wypisywanie, eksport, import danych Keybox\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Prosz� wprowadzi� PIN na klawiaturze czytnika"
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Zapytanie zwrotne o PIN zwr�ci�o b��d: %s\n"
@@ -6512,97 +6556,97 @@ msgstr "NullPIN nie zosta� jeszcze zmieniony\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.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr "|N|Nowy PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nie powi�d� si� zapis odcisku: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "nie powi�d� si� zapis daty utworzenia: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "odczyt klucza publicznego nie powi�d� si�: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr "odpowied� nie zawiera danych klucza publicznego\n"
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpowied� nie zawiera wsp�czynnika RSA\n"
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpowied� nie zawiera publicznego wyk�adnika RSA\n"
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 "||Prosz� wprowadzi� PIN na klawiaturze czytnika%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Prosz� wpisa� PIN%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Prosz� wpisa� PIN%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN dla CHV%d jest zbyt kr�tki; minimalna d�ugo�� to %d\n"
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "weryfikacja CHV%d nie powiod�a si�: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr "dost�p do polece� administratora nie zosta� skonfigurowany\n"
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr "b��d podczas odczytu stanu CHV z karty\n"
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr "karta zosta�a trwale zablokowana!\n"
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "Zosta�o %d pr�b PIN-u administratora do trwa�ego zablokowania karty\n"
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
@@ -6610,7 +6654,7 @@ msgid ""
 msgstr ""
 "||Prosz� wprowadzi� PIN na klawiaturze czytnika%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "||Prosz� wprowadzi� PIN na klawiaturze czytnika"
@@ -6618,99 +6662,110 @@ msgstr "||Prosz� wprowadzi� PIN na klawiaturze czytnika"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 msgid "|A|Admin PIN"
 msgstr "|A|PIN administratora"
 
-#. 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Prosz� wprowadzi� PIN%s%s%s aby odblokowa� kart�"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN dla CHV%d jest zbyt kr�tki; minimalna d�ugo�� to %d\n"
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nowy PIN administratora"
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 msgid "error reading application data\n"
 msgstr "b��d podczas odczytu danych aplikacji\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 msgid "error reading fingerprint DO\n"
 msgstr "b��d podczas odczytu odcisku DO\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 msgid "key already exists\n"
 msgstr "klucz ju� istnieje\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr "istniej�cy klucz zostanie zast�piony\n"
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 msgid "generating new key\n"
 msgstr "generowanie nowego klucza\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr "brak datownika utworzenia\n"
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "reszta RSA brakuj�ca lub o rozmiarze innym ni� %d bity\n"
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "publiczny wyk�adnik RSA brakuj�cy lub wi�kszy ni� %d bity\n"
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "liczba pierwsza %s RSA brakuj�ca lub o rozmiarze innym ni� %d bit�w\n"
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nie powi�d� si� zapis klucza: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr "prosz� czeka� na wygenerowanie klucza...\n"
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 msgid "generating key failed\n"
 msgstr "generowanie klucza nie powiod�o si�\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generowanie klucza zako�czone (%d sekund)\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr "odcisk na karcie nie zgadza si� z ��danym\n"
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "karta nie obs�uguje algorytmu skr�tu %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dotychczas stworzono podpis�w: %lu\n"
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "weryfikacja PIN-u administratora tym poleceniem jest aktualnie zabroniona\n"
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie mo�na dosta� si� do %s - niepoprawna karta OpenPGP?\n"
@@ -7048,17 +7103,17 @@ msgstr "prze��czanie do modelu �a�cuchowego"
 msgid "validation model used: %s"
 msgstr "u�yty model poprawno�ci: %s"
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "Klucz %s u�ywa niebezpiecznego (%u-bitowego) skr�tu\n"
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "skr�t %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(to jest algorytm MD2)\n"
 
@@ -7280,8 +7335,9 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
-msgstr ""
+#, fuzzy
+msgid "resource problem: out of core\n"
+msgstr "[B��d - brak pami�ci]"
 
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
@@ -7491,11 +7547,11 @@ msgstr "|NAZWA|u�ycie tego algorytmu skr�tu wiadomo�ci"
 msgid "|N|use compress algorithm N"
 msgstr "|N|u�ycie algorytmu kompresji N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgsm [opcje] [pliki] (-h podaje pomoc)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7506,59 +7562,59 @@ msgstr ""
 "MIME\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 msgid "usage: gpgsm [options] "
 msgstr "wywo�anie: gpgsm [opcje]"
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "UWAGA: nie mo�na zaszyfrowa� do ,,%s'': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nieznany model poprawno�ci ,,%s''\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "linia %d: nie podano nazwy przedmiotu\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  p = pomini�cie tego klucza\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "niezrozumia�y URL serwera kluczy\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr "OSTRZE�ENIE: dzia�anie z fa�szywym czasem systemowym: "
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "import wsp�lnych certyfikat�w ,,%s''\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nie mo�na podpisa� z u�yciem ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr "to polecenie nie zosta�o jeszcze zaimplementowane\n"
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8040,11 +8096,6 @@ msgstr "Nie znaleziono komponentu"
 msgid "No argument allowed"
 msgstr "Argument nie jest dozwolony"
 
-#: tools/no-libgcrypt.c:30
-#, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "b��d przydzielania wystarczaj�cej ilo�ci pami�ci: %s\n"
-
 #: tools/symcryptrun.c:152
 msgid ""
 "@\n"
diff --git a/po/pt.po b/po/pt.po
index a4e93dbc7..9e6b8981d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -97,20 +97,20 @@ msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -173,21 +173,35 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Repita a frase secreta: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repita a frase secreta: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
+
+#: agent/divert-scd.c:291
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -380,7 +394,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -397,30 +411,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, 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:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
@@ -1110,7 +1124,7 @@ msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 msgid "not human readable"
 msgstr "n�o leg�vel por humanos"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
@@ -1120,166 +1134,181 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, 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:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Este comando n�o � permitido no modo %s.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "partes da chave secreta n�o dispon�veis\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erro ao criar porta-chaves `%s': %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncias actualizadas"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, 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:815
+#: g10/card-util.c:901
 #, 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:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, 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:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1287,136 +1316,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, 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:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, 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:1241
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -1424,12 +1457,12 @@ msgstr "Comando inv�lido (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1478,7 +1511,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -1497,7 +1530,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
@@ -1525,7 +1558,7 @@ msgid ""
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1723,7 +1756,7 @@ msgstr "mostra impress�o digital"
 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:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, 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"
@@ -1973,7 +2006,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1985,7 +2018,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Cifra: "
 
@@ -1993,11 +2026,11 @@ msgstr "Cifra: "
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -2005,7 +2038,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
@@ -2154,7 +2187,7 @@ msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
@@ -2269,7 +2302,7 @@ msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
@@ -2310,11 +2343,11 @@ msgstr ""
 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
@@ -2394,150 +2427,150 @@ msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 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:3355
+#: g10/gpg.c:3346
 #, 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:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 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:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -2767,7 +2800,7 @@ msgstr "chave %08lX: chave nova - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
@@ -3350,8 +3383,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -3736,117 +3769,117 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3854,25 +3887,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:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3881,76 +3914,76 @@ 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 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:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3959,198 +3992,198 @@ 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:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 #, 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:3468
+#: g10/keyedit.c:3470
 #, 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:3474
+#: g10/keyedit.c:3476
 #, 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 #, 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:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, 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:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 #, 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:4148
+#: g10/keyedit.c:4150
 #, 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:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, 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:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 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:4660
+#: g10/keyedit.c:4662
 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:4687
+#: g10/keyedit.c:4689
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4869,7 +4902,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -5297,11 +5330,11 @@ msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -5683,12 +5716,12 @@ msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
@@ -5917,7 +5950,7 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "tentei %d vezes!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -6032,11 +6065,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:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6044,39 +6077,39 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicada\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -6461,67 +6494,77 @@ msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
 msgid "can't open fd %d: %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "erro de leitura"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "argumento inv�lido"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "comandos em conflito\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "n�o processado"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "n�o processado"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "op��es de importa��o inv�lidas\n"
@@ -6613,12 +6656,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6630,103 +6674,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, 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:615
+#: scd/app-openpgp.c:680
 #, 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:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "muda a frase secreta"
@@ -6734,103 +6778,114 @@ msgstr "muda a frase secreta"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "motivo da revoca��o: "
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%s' j� comprimido\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, 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:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -7190,17 +7245,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7428,7 +7483,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7652,12 +7707,12 @@ msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7668,60 +7723,60 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [op��es] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = saltar esta chave\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8206,11 +8261,6 @@ msgstr "chave p�blica n�o encontrada"
 msgid "No argument allowed"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: 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:152
 #, fuzzy
 msgid ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index efb241b95..39c3a0384 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+0200\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -101,20 +101,20 @@ msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -177,22 +177,36 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Digite o identificador de usu�rio: "
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Repita a frase secreta: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repita a frase secreta: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
+
+#: agent/divert-scd.c:291
 #, 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
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -384,7 +398,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -401,30 +415,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, 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:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
@@ -1116,7 +1130,7 @@ msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
@@ -1126,167 +1140,181 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, 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:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+msgid "This command is only available for version 2 cards\n"
+msgstr ""
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "a chave p�blica n�o est� mais dispon�vel"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado(s)"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "lista prefer�ncias"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Impress�o digital:"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1294,137 +1322,141 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, 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:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -1432,12 +1464,12 @@ msgstr "Comando inv�lido (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1487,7 +1519,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -1506,7 +1538,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
@@ -1531,7 +1563,7 @@ 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:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1727,7 +1759,7 @@ msgstr "Impress�o digital:"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
@@ -1981,7 +2013,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1993,7 +2025,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr ""
 
@@ -2001,12 +2033,12 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -2014,7 +2046,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
@@ -2163,7 +2195,7 @@ msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
@@ -2280,7 +2312,7 @@ msgstr "AVISO: `%s' � um arquivo vazio\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
@@ -2320,11 +2352,11 @@ msgstr ""
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
@@ -2409,153 +2441,153 @@ msgstr ""
 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:3355
+#: g10/gpg.c:3346
 #, 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:3366
+#: g10/gpg.c:3357
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3486
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, 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:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -2789,7 +2821,7 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
@@ -3354,8 +3386,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -3741,417 +3773,417 @@ msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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:3021
+#: g10/keyedit.c:3023
 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 #, 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:3032
+#: g10/keyedit.c:3034
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 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:3367
+#: g10/keyedit.c:3369
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3387
+#: g10/keyedit.c:3389
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3427
+#: g10/keyedit.c:3429
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3449
+#: g10/keyedit.c:3451
 #, 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:3468
+#: g10/keyedit.c:3470
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3476
 #, 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 #, 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:4148
+#: g10/keyedit.c:4150
 #, 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:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 #, 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:4660
+#: g10/keyedit.c:4662
 #, 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:4687
+#: g10/keyedit.c:4689
 #, 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:4713
+#: g10/keyedit.c:4715
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4943
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4881,7 +4913,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -5305,11 +5337,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -5695,12 +5727,12 @@ msgstr "%s: ignorado: a chave p�blica est� desativada\n"
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
@@ -5930,7 +5962,7 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "%d tentativas!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -6037,51 +6069,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:760
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:836
+#: g10/sign.c:834
 #, 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:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1262
+#: g10/sign.c:1260
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -6467,68 +6499,78 @@ msgstr "linha %u muito longa ou sem LF\n"
 msgid "can't open fd %d: %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "erro de leitura"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "linha muito longa\n"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "argumento inv�lido"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "comandos conflitantes\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "armadura inv�lida"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "n�o processado(s)"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "armadura inv�lida"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
 # help ou ajuda ???
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "n�o processado(s)"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "armadura inv�lida"
@@ -6620,12 +6662,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6637,103 +6680,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "muda a frase secreta"
@@ -6741,103 +6784,114 @@ msgstr "muda a frase secreta"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "rev- revoga��es de chaves incorreta\n"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%lu chaves processadas\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -7209,17 +7263,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7443,7 +7497,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7665,12 +7719,12 @@ msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7681,60 +7735,60 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Uso: gpgm [op��es] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8219,11 +8273,6 @@ msgstr "chave p�blica n�o encontrada"
 msgid "No argument allowed"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: 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:152
 #, fuzzy
 msgid ""
@@ -9711,9 +9760,6 @@ msgstr ""
 #~ msgid "Too many preference items"
 #~ msgstr "Muitos itens de prefer�ncia"
 
-#~ msgid "public key not anymore available"
-#~ msgstr "a chave p�blica n�o est� mais dispon�vel"
-
 # trauzir sombra ???
 #~ msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
 #~ msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 43d643875..2eac10e95 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -100,20 +100,20 @@ msgstr "algoritm rezumat %d nu este suportat\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
@@ -177,21 +177,35 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: am e�uat s� creez hashtable: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|PIN Admin"
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Repeta�i acest PIN: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repeta�i acest PIN: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
+
+#: agent/divert-scd.c:291
 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
+#: agent/divert-scd.c:303
 #, 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]"
@@ -383,7 +397,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -400,30 +414,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
@@ -1113,7 +1127,7 @@ msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
 msgid "not human readable"
 msgstr "ilizibil"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "cardul OpenPGP nu e disponibil: %s\n"
@@ -1123,153 +1137,168 @@ msgstr "cardul OpenPGP nu e disponibil: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr "[nesetat(�)]"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr "feminin"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr "nespecificat(�)"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "not forced"
 msgstr "nefor�at(�)"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr "for�at(�)"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Eroare: Deocamdat� sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Eroare: Spa�iile duble nu sunt permise.\n"
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, 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:585
+#: g10/card-util.c:636
 msgid "URL to retrieve public key: "
 msgstr "URL pentru a aduce cheia public�: "
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, 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:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 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"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, 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:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, 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:798
+#: g10/card-util.c:884
 msgid "Language preferences: "
 msgstr "Preferin�e limb�: "
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 msgid "Error: invalid length of preference string.\n"
 msgstr "Eroare: lungime invalid� pentru �ir preferin�e.\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Eroare: caractere invalide �n �ir preferin�e.\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sex ((M)asculin, (F)eminin sau spa�iu): "
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 msgid "Error: invalid response.\n"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Eroare: amprent� formatat� invalid.\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "opera�ia pe cheie nu e posibil�: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, 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:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr "�nlocuiesc cheia existent�? (d/N) "
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 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:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr "�nlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1280,120 +1309,124 @@ msgstr ""
 "   PIN = `%s'     PIN Admin = `%s'\n"
 "Ar trebui s� le schimba�i folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 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:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 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:1231
+#: g10/card-util.c:1317
 msgid "unknown key protection algorithm\n"
 msgstr "algoritm de protec�ie a cheii necunoscut\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 msgid "secret parts of key are not available\n"
 msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 msgid "list all available data"
 msgstr "afi�eaz� toate datele disponibile"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr "schimb� numele purt�torului cardului"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr "schimb� URL-ul de unde s� fie adus� cheia"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr "adu cheia specificat� de URL-ul de pe card"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 msgid "change the login name"
 msgstr "schimb� numele de login"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 msgid "change the language preferences"
 msgstr "schimb� preferin�ele de limb�"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr "schimb� sexul purt�torului cardului"
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 msgid "change a CA fingerprint"
 msgstr "schimb� o amprent� CA"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr "comut� fanionul PIN de for�are a semn�turii"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 msgid "generate new keys"
 msgstr "genereaz� noi chei"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr "verific� PIN-ul �i listeaz� toate datele"
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comand�> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 msgid "Admin-only command\n"
 msgstr "Comand� numai-administrare\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
@@ -1401,12 +1434,12 @@ msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1454,7 +1487,7 @@ msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
@@ -1473,7 +1506,7 @@ msgstr "folosesc cifrul %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
@@ -1502,7 +1535,7 @@ msgstr ""
 "AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1698,7 +1731,7 @@ msgstr "Amprenta CA: "
 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:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
@@ -1943,7 +1976,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1955,7 +1988,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Cifru: "
 
@@ -1963,11 +1996,11 @@ msgstr "Cifru: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -1975,7 +2008,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
@@ -2141,7 +2174,7 @@ msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
@@ -2252,7 +2285,7 @@ msgstr "%s:%d: op�iuni verificare invalide\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
@@ -2297,11 +2330,11 @@ msgstr ""
 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
@@ -2377,149 +2410,149 @@ msgstr "nu pute�i folosi algorimul de rezumat `%s' c�t� vreme �n modul %s\n"
 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:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 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:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 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:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -2749,7 +2782,7 @@ msgstr "cheia %s: cheie nou� - s�rit�\n"
 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:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
@@ -3305,8 +3338,8 @@ msgstr "Am verificat aceast� cheie foarte atent.\n"
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
@@ -3666,114 +3699,114 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 msgid "Save changes? (y/N) "
 msgstr "Salva�i schimb�rile?  (d/N) "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 msgid "Quit without saving? (y/N) "
 msgstr "Termina�i f�r� a salva?  (d/N) "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 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:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota�ie:"
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, c-format
 msgid "expired: %s"
 msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, c-format
 msgid "trust: %s"
 msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3782,17 +3815,17 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "expirat�"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3801,7 +3834,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3810,74 +3843,74 @@ 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 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:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "invalid(�)"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3887,196 +3920,196 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 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:3468
+#: g10/keyedit.c:3470
 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:3474
+#: g10/keyedit.c:3476
 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:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, 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:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 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:4148
+#: g10/keyedit.c:4150
 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:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, 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:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 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:4660
+#: g10/keyedit.c:4662
 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:4687
+#: g10/keyedit.c:4689
 #, 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:4713
+#: g10/keyedit.c:4715
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 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:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, 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"
@@ -4780,7 +4813,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
 
@@ -5198,13 +5231,13 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 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:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
@@ -5582,12 +5615,12 @@ msgstr "%s: s�rit�: cheia public� este deactivat�\n"
 msgid "no valid addressees\n"
 msgstr "nici un destinatar valid\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
@@ -5814,7 +5847,7 @@ msgstr "cheie slab� creat� - re�ncerc\n"
 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:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -5932,11 +5965,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:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5944,38 +5977,38 @@ msgstr ""
 "AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
 "destinatarului\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "s�rit� \"%s\": duplicat�\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "s�rit� \"%s\": %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "s�rit�: cheia secret� deja prezent�\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 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 "
@@ -6352,67 +6385,77 @@ msgstr "linia de intrare %u prea lung� sau lipse�te LF\n"
 msgid "can't open fd %d: %s\n"
 msgstr "nu pot deschide `%s': %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "eroare citire fi�ier"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "linie prea lung�"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "argument invalid"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "Comand� numai-administrare\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "op�iuni enumerare invalide\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "nefor�at(�)"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "op�iuni enumerare invalide\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "nefor�at(�)"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "op�iuni enumerare invalide\n"
@@ -6504,12 +6547,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
@@ -6521,103 +6565,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "am e�uat s� stochez data cre�rii: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr "r�spunsul nu con�ine datele cheii publice\n"
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr "r�spunsul nu con�ine modulul RSA\n"
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr "r�spunsul nu con�ine exponentul public RSA\n"
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, 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:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, 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"
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr "accesul la comenzile de administrare nu este configurat�\n"
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea st�rii CHV de pe card\n"
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr "cardul este �ncuiat permanent!\n"
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, 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"
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
@@ -6625,99 +6669,110 @@ msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 msgid "|A|Admin PIN"
 msgstr "|A|PIN Admin"
 
-#. 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplica�iei\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 msgid "key already exists\n"
 msgstr "cheia exist� deja\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr "cheia existent� va fi �nlocuit�\n"
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 msgid "generating new key\n"
 msgstr "generez o nou� cheie\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr "timestamp-ul de creare lipse�te\n"
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, 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"
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, 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"
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, 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"
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 msgid "generating key failed\n"
 msgstr "generarea cheii a e�uat\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generarea cheii este complet� (%d secunde)\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verificarea PIN-ului Admin este deocamdat� interzis� prin aceast� comand�\n"
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -7079,17 +7134,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7316,7 +7371,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7537,12 +7592,12 @@ msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
 msgid "|N|use compress algorithm N"
 msgstr "|N|folose�te algoritm compresie N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7553,61 +7608,61 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = s�ri peste cheia asta\n"
 
 #
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8089,11 +8144,6 @@ msgstr "cheia public� nu a fost g�sit�"
 msgid "No argument allowed"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: 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:152
 #, fuzzy
 msgid ""
diff --git a/po/ru.po b/po/ru.po
index f83b7a594..0b4d93ba0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.0.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+0200\n"
 "PO-Revision-Date: 2006-11-07 19:31+0300\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -90,20 +90,20 @@ msgstr "не поддерживаются ssh ключи превышающие
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
@@ -167,19 +167,33 @@ msgstr "не совпало, попробуйте еще раз"
 msgid "failed to create stream from socket: %s\n"
 msgstr "сбой создания потока из сокета: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr "Административный PID"
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Повторите ввод PIN"
+
+#: agent/divert-scd.c:285
 msgid "Repeat this PIN"
 msgstr "Повторите ввод PIN"
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "повторный PIN не совпал; попробуйте еще раз"
+
+#: agent/divert-scd.c:291
 msgid "PIN not correctly repeated; try again"
 msgstr "повторный PIN не совпал; попробуйте еще раз"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Введите PIN%s%s%s для доступа к карте"
@@ -361,7 +375,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|сохранить состояние в файл"
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "О найденных ошибках сообщайте <"
@@ -378,30 +392,30 @@ msgstr ""
 "Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
 "Управление закрытыми ключами для GnuPG\n"
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba слишком устаревшая (требуется %s, имеется %s)\n"
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
@@ -1086,7 +1100,7 @@ msgstr "ВНИМАНИЕ: обнаружено недопустимое прим
 msgid "not human readable"
 msgstr "не читаемое человеком"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Карта OpenPGP недоступна: %s\n"
@@ -1096,153 +1110,168 @@ msgstr "Карта OpenPGP недоступна: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Данная команда не допустима в режиме %s.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "секретная часть ключ не доступна\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr "[не установлено]"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr "мужской"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr "женский"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr "не задан"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "not forced"
 msgstr ""
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Ошибка: Допустим только чистый ASCII.\n"
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Ошибка: Нельзя использовать символ \"<\"\n"
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопустимы.\n"
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr "Фамилия владельца карты:"
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr "Имя владельца карты:"
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Ошибка: Скомбинированное имя слишком длинное (предел %d символов).\n"
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 msgid "URL to retrieve public key: "
 msgstr "URL для получения открытого ключа: "
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Ошибка: URL слишком длинный (предел - %d символов).\n"
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "ошибка распределения памяти: %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr "Учетная запись (имя):"
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Ошибка: Данные учетной записи слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr "Секретные DO данные:"
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Ошибка: Секретные DO данные слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 msgid "Language preferences: "
 msgstr "Предпочитаемый язык: "
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Пол ((M)Мужской, (F)Женский или пробел): "
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопустимый ответ.\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 msgid "CA fingerprint: "
 msgstr "отпечаток CA: "
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: неправильный формат отпечатка.\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операция с ключом невозможна: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 msgid "not an OpenPGP card"
 msgstr "карта не OpenPGP"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить существующий ключ? (y/N) "
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Сделать резервную копию ключа шифрования вне карты? (Y/n)"
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить существующие ключи? (y/N) "
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1253,120 +1282,124 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Следует изменить их используя команду --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип создаваемого ключа:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ подписи\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифрования\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где сохранить ключ:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 msgid "unknown key protection algorithm\n"
 msgstr "неизвестный алгоритм защиты ключа\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 msgid "secret parts of key are not available\n"
 msgstr "секретные части ключа недоступны\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "показать данную справку"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 msgid "list all available data"
 msgstr "вывести все доступные данные"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr "изменить имя владельца карты"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr "изменить URL получения ключа"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr "запросить ключ, указанный по заданному картой URL"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 msgid "change the login name"
 msgstr "изменить учетное имя"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 msgid "change the language preferences"
 msgstr "изменить языковые предпочтения"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr "изменение пола владельца карты"
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 msgid "change a CA fingerprint"
 msgstr "сменить отпечаток CA"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 msgid "generate new keys"
 msgstr "сгенерировать новые ключи"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменения или разблокировки PIN"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN и показать все данные"
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 msgid "Admin-only command\n"
 msgstr "Команды администратора\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 msgid "Admin commands are allowed\n"
 msgstr "Команды администрирования разрешены\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
@@ -1374,12 +1407,12 @@ msgstr "Недопустимая команда  (список команд: \"h
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1427,7 +1460,7 @@ msgstr ""
 "сначала воспользуйтесь \"--delete-secret-keys\" для удаления закрытого "
 "ключа.\n"
 
-#: g10/encode.c:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка создания фразы-пароля: %s\n"
@@ -1446,7 +1479,7 @@ msgstr "использутся алгоритм шифрования %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' уже сжат\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
@@ -1472,7 +1505,7 @@ msgid ""
 msgstr ""
 "ВНИМАНИЕ: использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1662,7 +1695,7 @@ msgstr ""
 "Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
 "selfsigned-uid\n"
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
@@ -1907,7 +1940,7 @@ msgstr ""
 "Подписи и их проверка, зашифрование и расшифрование\n"
 "действие по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1919,7 +1952,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
@@ -1927,11 +1960,11 @@ msgstr "Симметричные шифры: "
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -1939,7 +1972,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [параметры] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
@@ -2094,7 +2127,7 @@ msgstr "`%s' недопустимый срок действия подписи\n
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
@@ -2202,7 +2235,7 @@ msgstr "%s:%d: недопустимый список auto-key-locate\n"
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
 
@@ -2243,11 +2276,11 @@ msgstr "Следует использовать файлы (а не каналы
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
@@ -2323,150 +2356,150 @@ msgstr "нельзя использовать хэш-функцию `%s' в ре
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [файл]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [файл]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [файл]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [файл]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [файл]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [файл]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [файл]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [файл]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [файл]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [файл]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [команды]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[файл]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -2697,7 +2730,7 @@ msgstr "ключ %s: новый ключ - пропущен\n"
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
@@ -3246,8 +3279,8 @@ msgstr "Я очень тщательно проверил этот ключ.\n"
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
@@ -3596,113 +3629,113 @@ msgstr "Действительно обновить предпочтения д�
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? (y/N)"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? (y/N)"
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? (y/N)"
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Опции: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr "Предпочитаемый сервер ключей: "
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 msgid "Notations: "
 msgstr "Примечания: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2699
+#: g10/keyedit.c:2701
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Данный ключ был отозван %s - %s ключом %s\n"
 
-#: g10/keyedit.c:2720
+#: g10/keyedit.c:2722
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван %s ключом %s "
 
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, c-format
 msgid "usage: %s"
 msgstr "применяемость: %s"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3710,17 +3743,17 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока программа не будет перезапущена.\n"
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "просрочен с"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3728,7 +3761,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID помеченного как главный. Данная команда может\n"
 "              воспользоваться другим user ID, используя его как главный.\n"
 
-#: g10/keyedit.c:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3737,74 +3770,74 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Нельзя добавлять фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "недопустимый"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3813,187 +3846,187 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Нельзя добавлять назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3427
+#: g10/keyedit.c:3429
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3449
+#: g10/keyedit.c:3451
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3476
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Нельзя изменять срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "подписываемый подключ %s уже имеет перекрестную сертификацию\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "подключ %s не подписывающий и не нуждается в перекрестной подписи\n"
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 msgid "Enter the notation: "
 msgstr "Введите примечание:"
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 msgid "Proceed? (y/N) "
 msgstr "Обработать? (y/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет User ID с хешем %s\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4943
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
@@ -4692,7 +4725,7 @@ msgstr "ВНИМАНИЕ: обработчик сервера ключей от
 msgid "keyserver did not send VERSION\n"
 msgstr "сервер ключей не прислал VERSION\n"
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "не заданы серверы ключей (используйте --keyserver)\n"
 
@@ -5110,13 +5143,13 @@ msgstr "ВНИМАНИЕ: параметры в `%s' еще не активны
 msgid "can't handle public key algorithm %d\n"
 msgstr "не могу использовать алгоритм с открытым ключом %d\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ВНИМАНИЕ: потенциально небезопасный сеансовый ключ, зашифрованный "
 "симметричным шифром\n"
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
@@ -5486,12 +5519,12 @@ msgstr "%s: пропущено: открытый ключ отключен\n"
 msgid "no valid addressees\n"
 msgstr "нет действительных адресов\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "ключ %s не имеет User ID\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "ключ %s не имеет User ID\n"
@@ -5717,7 +5750,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "невозможно избежать слабого ключа для симметричного шифра; %d попыток!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA тебует размер хеша кратного 8 битам\n"
 
@@ -5832,11 +5865,11 @@ msgstr "сбой проверки созданной подписи: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s подпись от: \"%s\"\n"
 
-#: g10/sign.c:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5844,39 +5877,39 @@ msgstr ""
 "ВНИМАНИЕ: использование хэш-функции %s (%d) нарушает предпочтения "
 "получателя\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "ключ не помечен как ненадежный - не могу использовать его с ненадежным RNG!\n"
 
-#: g10/skclist.c:180
+#: g10/skclist.c:169
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "пропущено \"%s\": дубликат\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено \"%s\": %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "пропущено: секретный ключ уже имеется\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "это созданный PGP ElGamal ключ, не обеспечивающий безопасность подписи!"
@@ -6253,66 +6286,74 @@ msgstr "входная строка %u слишком длинная или пр
 msgid "can't open fd %d: %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "Команды администрирования не разрешены\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "ошибка чтения в `%s': %s\n"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "строка слишком длинная"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 msgid "missing argument"
 msgstr ""
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "Команды администратора\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "недопустимый список параметров\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+msgid "out of core"
+msgstr ""
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "недопустимый список параметров\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, fuzzy, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "параметр \"%s\" требует программы и опциональных аргументов\n"
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, fuzzy, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "параметр \"%s\" игнорирован по причине \"%s\"\n"
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+msgid "out of core\n"
+msgstr ""
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "недопустимый список параметров\n"
@@ -6404,12 +6445,13 @@ msgstr ""
 "Синтаксис: kbxutil [параметры] [файлы]\n"
 "просморт, экспорт, импорт данных Keybox\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6421,104 +6463,104 @@ msgstr "NullPIN всё еще не изменен\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.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr "|N|Новый PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "сбой сохранения отпечатка: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "сбой сохранения даты создания: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "сбой чтения открытого ключа: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr "ответ не содержит данных открытого ключа\n"
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе отсутствует модуль RSA\n"
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "при проверке CHV%d сбой: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr "доступ к командам управления не настроен\n"
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr "карта заблокирована!\n"
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "осталось %d попыток ввода административного PIN перед блокировкой карты\n"
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
@@ -6526,99 +6568,110 @@ msgstr "||Введите PIN%%0A[подписей: %lu]"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 msgid "|A|Admin PIN"
 msgstr "|A|Административный PID"
 
-#. 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Введите PIN%s%s%s для доступа к карте"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новый административный PIN"
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 msgid "error reading application data\n"
 msgstr "ошибка чтения данных приложения\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтения отпечатка DO\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 msgid "key already exists\n"
 msgstr "ключ уже существует\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr "существующий ключ будет заменен\n"
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 msgid "generating new key\n"
 msgstr "генерация нового ключа\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr "пропущен штамп создания создания\n"
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 msgid "generating key failed\n"
 msgstr "сбой при генерации ключа\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "ключ сгенерирован (%d секунд)\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карта не поддерживает функцию хеширования %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "подписей создано: %lu\n"
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещена этой командой\n"
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
@@ -6969,17 +7022,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, fuzzy, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "ключ DSA %s использует небезопасный (%u бит) хеш\n"
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(это MD2 алгоритм)\n"
 
@@ -7200,7 +7253,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7411,11 +7464,11 @@ msgstr "|NAME|использовать хеш-функцию NAME"
 msgid "|N|use compress algorithm N"
 msgstr "|N|использовать алгоритм сжатия N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Использование: gpgsm [параметры] [файлы] (-h для подсказки)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7426,59 +7479,59 @@ msgstr ""
 "протокол\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 msgid "usage: gpgsm [options] "
 msgstr "использование: gpgsm [параметры] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "не могу зашифровать для `%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Пояснения отсутствуют)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = пропустить этот ключ\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr "ВНИМАНИЕ: выполняемся с подделанным системным временем: "
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "невозможно подписать используя `%s': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr "данная команды всё еще не реализована\n"
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7958,11 +8011,6 @@ msgstr "Компонент не найден"
 msgid "No argument allowed"
 msgstr "Команды администрирования не разрешены\n"
 
-#: tools/no-libgcrypt.c:30
-#, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "ошибка распределения памяти: %s\n"
-
 #: tools/symcryptrun.c:152
 msgid ""
 "@\n"
diff --git a/po/sk.po b/po/sk.po
index 172627445..865a697c3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -93,20 +93,20 @@ msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
@@ -169,21 +169,35 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Opakujte heslo: "
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Opakujte heslo: "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
+
+#: agent/divert-scd.c:291
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
@@ -375,7 +389,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -394,30 +408,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, 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:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
@@ -1106,7 +1120,7 @@ msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
 msgid "not human readable"
 msgstr "nie je v priamo �itate�nom form�te"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tajn� k��� nie je dostupn�"
@@ -1116,166 +1130,181 @@ msgstr "tajn� k��� nie je dostupn�"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "tajn� �asti k���a nie s� dostupn�\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 #, fuzzy
 msgid "unspecified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 #, fuzzy
 msgid "not forced"
 msgstr "nespracovan�"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 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"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizova� predvo�by"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, 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:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1283,136 +1312,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 #, 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:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 #, 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:1231
+#: g10/card-util.c:1317
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 #, 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:1241
+#: g10/card-util.c:1327
 #, 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:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 #, fuzzy
 msgid "list all available data"
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeni� dobu platnosti"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Pr�kaz> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
@@ -1420,12 +1453,12 @@ msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1474,7 +1507,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -1493,7 +1526,7 @@ msgstr "pou�it� �ifra %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
@@ -1519,7 +1552,7 @@ 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:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1722,7 +1755,7 @@ 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:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
@@ -1975,7 +2008,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1987,7 +2020,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "�ifry: "
 
@@ -1995,11 +2028,11 @@ msgstr "�ifry: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -2007,7 +2040,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
@@ -2159,7 +2192,7 @@ msgstr "%s nie je platn� znakov� sada\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
@@ -2274,7 +2307,7 @@ msgstr "%s:%d: neplatn� parameter pre export\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
@@ -2316,11 +2349,11 @@ msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 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:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
@@ -2398,154 +2431,154 @@ msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
 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:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -2775,7 +2808,7 @@ msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
@@ -3362,8 +3395,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
@@ -3744,117 +3777,117 @@ msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 #, fuzzy
 msgid "Notations: "
 msgstr "Not�cie: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3862,19 +3895,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:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3882,7 +3915,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:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3891,75 +3924,75 @@ 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 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:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3968,196 +4001,196 @@ 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:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 #, 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:3468
+#: g10/keyedit.c:3470
 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:3474
+#: g10/keyedit.c:3476
 #, 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:3535
+#: g10/keyedit.c:3537
 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:3541
+#: g10/keyedit.c:3543
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 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:3688
+#: g10/keyedit.c:3690
 #, 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:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 #, 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:4148
+#: g10/keyedit.c:4150
 #, 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:4210
+#: g10/keyedit.c:4212
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, 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:4508
+#: g10/keyedit.c:4510
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, 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:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 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:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, 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:4713
+#: g10/keyedit.c:4715
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4873,7 +4906,7 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -5300,12 +5333,12 @@ msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 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:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -5687,12 +5720,12 @@ msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
 msgid "no valid addressees\n"
 msgstr "�iadne platn� adresy\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
@@ -5920,7 +5953,7 @@ msgstr ""
 "nem��em sa vyvarova� slab�ho k���a pre symetrick� �ifru; oper�ciu som sk�sil "
 "%d kr�t!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
@@ -6036,54 +6069,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:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, 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:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "presko�en� `%s': duplikovan�\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "presko�en� `%s': %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -6467,67 +6500,77 @@ msgstr "vstupn� riadok %u je pr�li� dlh� alebo na konci ch�ba znak LF\n"
 msgid "can't open fd %d: %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "chyba pri ��tan� s�boru"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "neplatn� argument"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "konfliktn� pr�kazy\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "neplatn� parameter pre import\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "nespracovan�"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "neplatn� parameter pre import\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "nespracovan�"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "neplatn� parameter pre import\n"
@@ -6621,12 +6664,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6638,103 +6682,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "zmeni� heslo"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "zmeni� heslo"
@@ -6742,103 +6786,114 @@ msgstr "zmeni� heslo"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 #, fuzzy
 msgid "generating new key\n"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
@@ -7198,17 +7253,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7433,7 +7488,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7659,12 +7714,12 @@ msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
 msgid "|N|use compress algorithm N"
 msgstr "|N|pou�i� kompresn� algoritmus N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7675,60 +7730,60 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(�iadny popis)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = presko�i� tento k���\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8211,11 +8266,6 @@ msgstr "verejn� k��� nen�jden�"
 msgid "No argument allowed"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: 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:152
 #, fuzzy
 msgid ""
diff --git a/po/sv.po b/po/sv.po
index 8970f1ded..fd358efc6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg trunk\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+0200\n"
 "PO-Revision-Date: 2008-07-21 09:04+0200\n"
 "Last-Translator: Daniel Nylander <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -117,20 +117,20 @@ msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -194,19 +194,33 @@ msgstr "stämmer inte överens - försök igen"
 msgid "failed to create stream from socket: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr "Admin PIN-kod"
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Upprepa denna PIN-kod"
+
+#: agent/divert-scd.c:285
 msgid "Repeat this PIN"
 msgstr "Upprepa denna PIN-kod"
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "PIN-kod repeterades inte korrekt; försök igen"
+
+#: agent/divert-scd.c:291
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-kod repeterades inte korrekt; försök igen"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
@@ -401,7 +415,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|FIL|skriv miljöinställningar även till FIL"
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Rapportera fel till <"
@@ -418,30 +432,30 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s är för gammal (behöver %s, har %s)\n"
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
@@ -1118,7 +1132,7 @@ msgstr "VARNING: ogiltig notationsdata hittades\n"
 msgid "not human readable"
 msgstr "inte läsbart"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
@@ -1128,153 +1142,168 @@ msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i satsläge\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "de hemliga nyckeldelarna är inte tillgängliga\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr "[inte inställt]"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr "man"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr "kvinna"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr "ej angiven"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "not forced"
 msgstr "inte tvingad"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr "tvingad"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fel: Endast ren ASCII tillåts för närvarande.\n"
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fel: Tecknet \"<\" får inte användas.\n"
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Fel: Fullständigt namn för långt (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 msgid "URL to retrieve public key: "
 msgstr "Url för att hämta publik nyckel: "
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fel: Inloggningsdata är för långt (gräns är %d tecken).\n"
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fel: ogiltig längd på inställningssträngen\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nyckelåtgärden är inte möjlig: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Skapa säkerhetskopia av krypteringsnyckel utanför kortet? (J/n) "
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1285,122 +1314,126 @@ msgstr ""
 "   PIN-kod = \"%s\"     Admin PIN-kod = \"%s\"\n"
 "Du bör ändra dem med kommandot --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 msgid "Please select the type of key to generate:\n"
 msgstr "Välj vilken typ av nyckel som ska genereras:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 msgid "Please select where to store the key:\n"
 msgstr "Välj var nyckeln ska sparas:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 msgid "unknown key protection algorithm\n"
 msgstr "okänd nyckelskyddsalgoritm\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 msgid "secret parts of key are not available\n"
 msgstr "hemliga delar av nyckeln är inte tillgängliga.\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 msgid "secret key already stored on a card\n"
 msgstr "hemlig nyckel redan lagrad på ett kort\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 msgid "list all available data"
 msgstr "lista allt tillgängligt data"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr "ändra url för att hämta nyckel"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr "hämta nyckel som anges i kortets url"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 msgid "change the login name"
 msgstr "ändra inloggningsnamnet"
 
 # originalet borde ha ett value
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr "ändra kortinnehavarens kön"
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 msgid "change a CA fingerprint"
 msgstr "ändra ett CA-fingeravtryck"
 
 # den låter skum
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr "växla flagga för att tvinga signatur-PIN-kod"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr "meny för att ändra eller avblockera PIN-koden"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr "validera PIN-koden och lista allt data"
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (prova med \"help\")\n"
 
@@ -1409,12 +1442,12 @@ 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:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1460,7 +1493,7 @@ msgstr "det finns en hemlig nyckel för denna publika nyckeln \"%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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel när lösenfras skapades: %s\n"
@@ -1479,7 +1512,7 @@ msgstr "använder %s-chiffer\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" är redan komprimerad\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
@@ -1508,7 +1541,7 @@ msgstr ""
 "VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1702,7 +1735,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n"
@@ -1953,7 +1986,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1965,7 +1998,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Chiffer: "
 
@@ -1973,11 +2006,11 @@ msgstr "Chiffer: "
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr "Använda bibliotek:"
 
@@ -1985,7 +2018,7 @@ msgstr "Använda bibliotek:"
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
@@ -2140,7 +2173,7 @@ msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
@@ -2248,7 +2281,7 @@ msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
@@ -2291,11 +2324,11 @@ msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
 
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
@@ -2381,149 +2414,149 @@ msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
@@ -2757,7 +2790,7 @@ msgstr "nyckel %s: ny nyckel - hoppade över\n"
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
@@ -3315,8 +3348,8 @@ msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
 msgid "Really sign? (y/N) "
 msgstr "Verkligen signera? (j/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
@@ -3677,115 +3710,115 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringar? (j/N) "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? (j/N) "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 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:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr "Nyckelserver no-modify"
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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 en användaridentitet av PGP 2.x-"
 "typ.\n"
 
-#: g10/keyedit.c:2699
+#: g10/keyedit.c:2701
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Den här nyckeln blev spärrad den %s av %s nyckel %s\n"
 
-#: g10/keyedit.c:2720
+#: g10/keyedit.c:2722
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s"
 
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3793,17 +3826,17 @@ msgstr ""
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "spärrad"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "utgånget"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3812,7 +3845,7 @@ msgstr ""
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: g10/keyedit.c:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3821,75 +3854,75 @@ msgstr ""
 "VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto-id kan\n"
 "         vissa versioner av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 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:3032
+#: g10/keyedit.c:3034
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Verkligen ta bort denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Användaridentitet \"%s\": redan minimerad\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3899,195 +3932,195 @@ msgstr ""
 "denna\n"
 "         nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte lägga till en spärrnyckel för en PGP 2.x-nyckel.\n"
 
-#: g10/keyedit.c:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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.x-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 msgid "this key has already been designated as a revoker\n"
 msgstr "den här nyckeln har redan markerats som en spärrnyckel\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ångra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3476
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som mest en undernyckel.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 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:3688
+#: g10/keyedit.c:3690
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "undernyckeln %s signerar inte och behöver inte korscertifieras\n"
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
 
-#: g10/keyedit.c:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr "Ange din föredragna nyckelserver-url: "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Är du säker på att du vill ersätta det? (j/N) "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Är du säker på att du vill ta bort det? (j/N) "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med indexet %d\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signerat av din nyckel %s den %s%s%s\n"
 
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Är du säker på att du fortfarande vill spärra den? (j/N)"
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 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:4687
+#: g10/keyedit.c:4689
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter med nyckeln %s:\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VARNING: en signatur på en användaridentitet är daterad %d sekunder in i "
 "framtiden\n"
 
-#: g10/keyedit.c:4943
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, 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 %s (uid %d)\n"
@@ -4806,7 +4839,7 @@ msgstr "VARNING: nyckelserverhanteraren från en annan version av GnuPG (%s)\n"
 msgid "keyserver did not send VERSION\n"
 msgstr "nyckelserver skickade inte VERSION\n"
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
 
@@ -5230,11 +5263,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritmen %d för publika nycklar\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, 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"
@@ -5614,12 +5647,12 @@ msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
 msgid "no valid addressees\n"
 msgstr "inga giltiga adressater\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Observera: nyckeln %s har ingen %s-förmåga\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
@@ -5858,7 +5891,7 @@ msgstr ""
 "kan inte undvika en svag nyckel för symmetriskt chiffer;\n"
 "försökte %d gånger!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA kräver att hashlängden är delbar med 8 bitar\n"
 
@@ -5976,13 +6009,13 @@ msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signatur från: \"%s\"\n"
 
-#: g10/sign.c:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5990,43 +6023,43 @@ msgstr ""
 "VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
 
 # Slumptalsgenerator: Random Number Generator
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppade över \"%s\": förekommer flera gånger\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
@@ -6420,60 +6453,70 @@ msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 msgid "can't open fd %d: %s\n"
 msgstr "kan inte öppna fd %d: %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 msgid "argument not expected"
 msgstr "argument förväntades inte"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 msgid "read error"
 msgstr "läsfel"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 msgid "keyword too long"
 msgstr "nyckelordet är för långt"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 msgid "invalid command"
 msgstr "ogiltigt kommando"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 msgid "invalid alias definition"
 msgstr "ogiltig aliasdefinition"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "[Fel - slut på kärna]"
+
+#: jnlib/argparse.c:191
 msgid "invalid option"
 msgstr "ogiltig flagga"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "flaggan \"%.50s\" förväntar sig inte ett argument\n"
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "ogiltigt kommando \"%.50s\"\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "flagga \"%.50s\" är tvetydig\n"
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "kommandot \"%.50s\" är tvetydigt\n"
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "[Fel - slut på kärna]"
+
+#: jnlib/argparse.c:212
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "ogiltig flagga \"%.50s\"\n"
@@ -6565,12 +6608,13 @@ msgstr ""
 "Syntax: kbxutil [flaggor] [filer]\n"
 "lista, exportera, importera nyckelskåpsdata\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Knappa in din PIN-kod på läsarens knappsats"
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-återanrop returnerade fel: %s\n"
@@ -6582,98 +6626,98 @@ msgstr "NullPIN har ännu inte ändrats\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.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN-kod"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att lagra datum för skapandet: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "läsning av publik nyckel misslyckades: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr "svaret innehåller inte publikt nyckeldata\n"
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr "svaret innehåller inte en RSA-modulus\n"
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "använder standard-PIN som %s\n"
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "misslyckades med att använda standard-PIN som %s: %s - inaktiverar "
 "ytterligare standardanvändning\n"
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Ange din PIN-kod på läsarens knappsats%%0A[signaturer gjorda: %lu]"
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "validering av CHV%d misslyckades: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr "fel vid hämtning av CHV-status från kort\n"
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr "kortet är låst permanent!\n"
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d försök för Admin PIN-koden återstår innan kortet låses permanent\n"
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
@@ -6682,107 +6726,118 @@ msgstr ""
 "|A|Ange administratörens PIN-kod på läsarens knappsats%%0A[återstående "
 "försök: %d]"
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "|A|Ange administratörens PIN-kod på läsarens knappsats"
 
 #. 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:1590
+#: scd/app-openpgp.c:1657
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN-kod"
 
-#. 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN-kod"
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 msgid "error reading application data\n"
 msgstr "fel vid läsning av programdata\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 msgid "error reading fingerprint DO\n"
 msgstr "fel vid läsning av fingeravtryckets DO\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 msgid "key already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr "befintlig nyckel kommer att ersättas\n"
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 msgid "generating new key\n"
 msgstr "genererar ny nyckel\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr "tidsstämpel för skapandet saknas\n"
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus saknas eller är inte %d bitar stor\n"
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n"
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att lagra nyckeln: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr "var god vänta under tiden nyckeln genereras ...\n"
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 msgid "generating key failed\n"
 msgstr "nyckelgenereringen misslyckades\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "nyckelgenereringen är färdig (%d sekunder)\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr "avtrycket på kortet stämmer inte med den begärda\n"
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "validering av Admin PIN-kod är för närvarande förbjudet genom detta "
 "kommando\n"
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@ -7120,17 +7175,17 @@ msgstr "växlar till kedjemodell"
 msgid "validation model used: %s"
 msgstr "valideringsmodell använd: %s"
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s-nyckeln använder en osäker hash (%u bitar)\n"
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "en %u-bitars hash är inte giltig för en %u-bitars %s-nyckel\n"
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(det här är MD2-algoritmen)\n"
 
@@ -7349,7 +7404,8 @@ msgstr ""
 "Färdig.  Du bör nu skicka denna begäran till din certifikatutfärdare.\n"
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+#, fuzzy
+msgid "resource problem: out of core\n"
 msgstr "resursproblem: out or core\n"
 
 #: sm/decrypt.c:324
@@ -7557,12 +7613,12 @@ msgstr "|NAMN|använd sammandragsalgoritmen NAMN"
 msgid "|N|use compress algorithm N"
 msgstr "|N|använd komprimeringsalgoritmen N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Användning: gpgsm [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7572,58 +7628,58 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 msgid "usage: gpgsm [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "OBSERVERA: kommer inte att kunna kryptera till \"%s\": %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "okänd valideringsmodell \"%s\"\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: inget värdnamn angivet\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: lösenord angivet utan användare\n"
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: hoppar över denna rad\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 msgid "could not parse keyserver\n"
 msgstr "kunde inte tolka nyckelserver\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr "det här kommandot har ännu inte implementerats\n"
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
 
@@ -8100,11 +8156,6 @@ msgstr "Komponenten hittades inte"
 msgid "No argument allowed"
 msgstr "Inget argument tillåts"
 
-#: tools/no-libgcrypt.c:30
-#, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
-
 #: tools/symcryptrun.c:152
 msgid ""
 "@\n"
diff --git a/po/tr.po b/po/tr.po
index 79a4ec99d..12541d87c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.9.94\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+0200\n"
 "PO-Revision-Date: 2006-11-04 03:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -93,20 +93,20 @@ msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -170,19 +170,33 @@ msgstr "aynı değiller - tekrar deneyin"
 msgid "failed to create stream from socket: %s\n"
 msgstr "sokette akım oluşturulamadı: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr "Yönetici PIN'i"
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "Bu PIN tekrarlansın "
+
+#: agent/divert-scd.c:285
 msgid "Repeat this PIN"
 msgstr "Bu PIN tekrarlansın "
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
+
+#: agent/divert-scd.c:291
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s giriniz"
@@ -364,7 +378,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Yazılım hatalarını lütfen <"
@@ -381,30 +395,30 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba çok eski (gereken %s, sizinki %s)\n"
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
@@ -1091,7 +1105,7 @@ msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
 msgid "not human readable"
 msgstr "insan okuyabilir değil"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
@@ -1101,153 +1115,168 @@ msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "%s kipindeyken bu komut kullanılamaz.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "gizli anahtar parçaları kullanım dışı\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr "[belirtilmedi]"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr "erkek"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr "dişi"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr "belirtilmemiş"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "not forced"
 msgstr "zorlanmadı"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr "zorlandı"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Hata: Çift boşluğa izin verilmez.\n"
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr "Kart sahibinin soyadı: "
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr "Kart sahibinin adı: "
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, 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:585
+#: g10/card-util.c:636
 msgid "URL to retrieve public key: "
 msgstr "genel anahtarın alınacağı URL: "
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, 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:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "yeterli bellek ayrılırken hata: %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr "Oturum açma verisi (hesap adı): "
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, 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:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, 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:798
+#: g10/card-util.c:884
 msgid "Language preferences: "
 msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 msgid "Error: invalid length of preference string.\n"
 msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 msgid "Error: invalid response.\n"
 msgstr "Hata: yanıt geçersiz.\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 msgid "CA fingerprint: "
 msgstr "CA parmak izi: "
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hata: biçimli parmakizi geçersiz\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "anahtar işlemi mümkün değil: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 msgid "not an OpenPGP card"
 msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, 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:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 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:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1258,120 +1287,124 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 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:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 msgid "   (1) Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 msgid "unknown key protection algorithm\n"
 msgstr "bilinmeyen anahtar koruma algoritması\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 msgid "secret parts of key are not available\n"
 msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 msgid "secret key already stored on a card\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "bunu gösterir"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 msgid "list all available data"
 msgstr "tüm kullanılabilir veriyi listeler"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr "kart sahibinin ismini değiştirir"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr "anahtarın alınacağı URL değiştirilir"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr "kart URL'sinde belirtilmiş anahtarı alır"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 msgid "change the login name"
 msgstr "oturum açma ismini değiştirir"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 msgid "change the language preferences"
 msgstr "dil tercihlerini değiştirir"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr "kart sahibinin cinsiyetini değiştirir"
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 msgid "change a CA fingerprint"
 msgstr "bir CA parmakizini değiştirir"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr "imza zorlama PIN'i bayrağını değiştirir"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 msgid "generate new keys"
 msgstr "yeni anahtarlar üretir"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr "PIN'i değiştirme veya engelleme menüsü"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr "PIN'i doğrular ve tüm veriyi listeler"
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 msgid "Admin-only command\n"
 msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 msgid "Admin commands are allowed\n"
 msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
@@ -1379,12 +1412,12 @@ msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1430,7 +1463,7 @@ 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:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@ -1449,7 +1482,7 @@ msgstr "%s şifrelemesi kullanılıyor\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
@@ -1478,7 +1511,7 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
 "zorlanıyor\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1671,7 +1704,7 @@ 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:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1919,7 +1952,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1931,7 +1964,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "Şifre: "
 
@@ -1939,11 +1972,11 @@ msgstr "Şifre: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -1951,7 +1984,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
@@ -2101,7 +2134,7 @@ msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
@@ -2215,7 +2248,7 @@ msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
@@ -2255,11 +2288,11 @@ msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
@@ -2335,148 +2368,148 @@ msgstr "%2$s kipindeyken '%1$s' özümleme algoritması kullanılamaz\n"
 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:3355
+#: g10/gpg.c:3346
 #, 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:3366
+#: g10/gpg.c:3357
 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:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, 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:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 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:3424
+#: g10/gpg.c:3415
 #, 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:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 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:3475
+#: g10/gpg.c:3466
 #, 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:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, 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:3656
+#: g10/gpg.c:3647
 #, 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:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -2707,7 +2740,7 @@ msgstr "anahtar %s: yeni anahtar - atlandı\n"
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtarlık yok: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
@@ -3270,8 +3303,8 @@ msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
@@ -3646,116 +3679,116 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 msgid "Save changes? (y/N) "
 msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 msgid "Notations: "
 msgstr "Simgelemler: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 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:2699
+#: g10/keyedit.c:2701
 #, 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:2720
+#: g10/keyedit.c:2722
 #, 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:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3763,17 +3796,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:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3782,7 +3815,7 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3791,74 +3824,74 @@ 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:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 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:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "geçersiz"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3868,204 +3901,204 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 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:3387
+#: g10/keyedit.c:3389
 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:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 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:3468
+#: g10/keyedit.c:3470
 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:3474
+#: g10/keyedit.c:3476
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 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:3548
+#: g10/keyedit.c:3550
 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:3594
+#: g10/keyedit.c:3596
 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:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "yardımcı anahtar %s imzalamıyor, dolayısıyla çapraz sertifikalı olması "
 "gerekmiyor\n"
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, 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:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 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:4148
+#: g10/keyedit.c:4150
 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:4210
+#: g10/keyedit.c:4212
 msgid "Enter the notation: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 msgid "Proceed? (y/N) "
 msgstr "Devam? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%s çittirmeli kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, 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:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 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 veya y/N) "
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 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 veya "
 "y/N) "
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, 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:4713
+#: g10/keyedit.c:4715
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, 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:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 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 "
 "veya y/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, 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:4943
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, 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:5100
+#: g10/keyedit.c:5102
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4771,7 +4804,7 @@ msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s
 msgid "keyserver did not send VERSION\n"
 msgstr "anahtar sunucusu VERSION göndermiyor\n"
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
 
@@ -5188,11 +5221,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -5566,12 +5599,12 @@ msgstr "%s: atlandı: genel anahtar iptal edildi\n"
 msgid "no valid addressees\n"
 msgstr "geçerli adresler yok\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
@@ -5804,7 +5837,7 @@ msgstr ""
 "simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere "
 "denendi!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA sekizin katlarında bir çittirim uzunluğu gerektirir\n"
 
@@ -5921,12 +5954,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:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5934,40 +5967,40 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) özümleme algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 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:180
+#: g10/skclist.c:169
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\" atlandı: tekrarlanmış\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 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ı!"
 
@@ -6344,66 +6377,76 @@ msgstr "girdi satırı %u ya çok uzun ya da sonunda satırsonu karakteri yok\n"
 msgid "can't open fd %d: %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "`%s' için okuma hatası: %s\n"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "satır çok uzun"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 msgid "missing argument"
 msgstr ""
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "Yöneticiye özel komut\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "[Hata - nüve dışında]"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, fuzzy, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "\"%s\" seçeneği bir program ve seçimlik argümanlar gerektirir\n"
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, fuzzy, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "\"%2$s\" nedeniyle \"%1$s\" seçeneği yoksayıldı\n"
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "[Hata - nüve dışında]"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "liste seçenekleri geçersiz\n"
@@ -6495,13 +6538,14 @@ msgstr ""
 "Sözdizimi: kbxutil [seçenekler] [dosyalar]\n"
 "Anahtar kutusu verisini listeler, ithal ve ihraç eder\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 #, fuzzy
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
@@ -6513,104 +6557,104 @@ msgstr "BoşPIN henüz değişmedi\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.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "genel anahtar okuması başarısız: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr "yanıt genel anahtar verisi içermiyor\n"
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr "yanıt RSA modülü içermiyor\n"
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Lütfen PIN'i giriniz%%0A[yapılan imza: %lu]"
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Lütfen PIN'i giriniz%%0A[yapılan imza: %lu]"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, 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"
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, 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"
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
@@ -6618,98 +6662,109 @@ msgstr "bir okuyucu tuştakımı kullanılmaz"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 msgid "|A|Admin PIN"
 msgstr "|A|Yönetici PIN'i"
 
-#. 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s giriniz"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Yeni Yönetici PIN'i"
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 msgid "error reading fingerprint DO\n"
 msgstr "parmakizi DO okunurken hata\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr "mevcut anahtar konulacak\n"
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr "oluşturum zaman damgası kayıp\n"
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modülü ya eksik ya da %d bitlik değil\n"
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA genel üstel sayısı ya eksik ya da %d bitten büyük\n"
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA asal sayısı %s ya eksik la da %d bitlik değil\n"
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 msgid "generating key failed\n"
 msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kart %s özet algoritmasını desteklemiyor\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "Yönetici PIN'inin doğrulanması bu komut yüzünden şimdilik yasaktır\n"
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -7062,17 +7117,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, fuzzy, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "DSA anahtarı %s, güvensiz bir çittirim (%u bitlik) kullanıyor\n"
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(bu, MD2 algoritmasıdır)\n"
 
@@ -7294,8 +7349,9 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
-msgstr ""
+#, fuzzy
+msgid "resource problem: out of core\n"
+msgstr "[Hata - nüve dışında]"
 
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
@@ -7505,11 +7561,11 @@ 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"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgsm [seçenekler] [dosyalar] (yardım için -h)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7519,59 +7575,59 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme S/MIME protokolü kullanarak yapılır\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 msgid "usage: gpgsm [options] "
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "`%s'e şifrelenemez: %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%d. satır: konu ismi belirtilmemiş\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " a = bu anahtarı atla\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr "bu komut henüz gerçeklenmedi\n"
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8058,11 +8114,6 @@ msgstr "Bileşen yok"
 msgid "No argument allowed"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: tools/no-libgcrypt.c:30
-#, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "yeterli bellek ayrılırken hata: %s\n"
-
 #: tools/symcryptrun.c:152
 msgid ""
 "@\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f3262bf81..a72fbfb2e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+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"
@@ -100,20 +100,20 @@ msgstr "不支持保护散列 %d\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
@@ -176,21 +176,35 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s：建立散列表失败：%s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|管理员 PIN"
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "再次输入此 PIN："
+
+#: agent/divert-scd.c:285
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "再次输入此 PIN："
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "PIN 再次输入时与首次输入不符；请再试一次"
+
+#: agent/divert-scd.c:291
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, fuzzy, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
@@ -382,7 +396,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -401,30 +415,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
@@ -1106,7 +1120,7 @@ msgstr "找不到有效的 OpenPGP 数据。\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
@@ -1116,153 +1130,168 @@ msgstr "OpenPGP 卡不可用：%s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "在 %s 模式中不允许使用这个指令。\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "私钥部分不可用\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "您的选择？ "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr "[未设定]"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr "未定义"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "not forced"
 msgstr "可选"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr "必须"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目前只允许使用 ASCII 字符。\n"
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：不能使用字符“<”。\n"
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr "卡持有人的姓："
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr "卡持有人的名："
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 msgid "URL to retrieve public key: "
 msgstr "获取公钥的 URL："
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "建立钥匙环‘%s’时发生错误：%s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr "登录数据(帐号名)："
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr "个人 DO 数据："
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 msgid "Language preferences: "
 msgstr "首选语言："
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：首选项字符串长度无效。\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：首选项字符串里有无效字符。\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 msgid "CA fingerprint: "
 msgstr "CA 指纹："
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "针对密钥的操作无法实现：%s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 msgid "not an OpenPGP card"
 msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1273,120 +1302,124 @@ msgstr ""
 "  PIN = ‘%s’    管理员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签名密钥\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 msgid "unknown key protection algorithm\n"
 msgstr "不支持的密钥保护算法\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 msgid "secret parts of key are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "显示这份在线说明"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr "更改卡持有人的姓名"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr "更改获取密钥的 URL"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 msgid "change the language preferences"
 msgstr "更改首选语言首选"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr "更改卡持有人的性别"
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr "设定 PIN 签名是否必须"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "命令> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 msgid "Admin commands are allowed\n"
 msgstr "允许使用管理员命令\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
@@ -1394,12 +1427,12 @@ msgstr "无效的指令(尝试“help”)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1445,7 +1478,7 @@ msgstr "公钥“%s”有对应的私钥！\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
@@ -1464,7 +1497,7 @@ msgstr "使用对称加密算法 %s\n"
 msgid "`%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
@@ -1489,7 +1522,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1675,7 +1708,7 @@ msgstr "CA 指纹："
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
@@ -1922,7 +1955,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1934,7 +1967,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "对称加密："
 
@@ -1942,11 +1975,11 @@ msgstr "对称加密："
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr ""
 
@@ -1954,7 +1987,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
@@ -2099,7 +2132,7 @@ msgstr "‘%s’不是一个有效的签名过期日期\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
@@ -2207,7 +2240,7 @@ msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
@@ -2247,11 +2280,11 @@ msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
@@ -2327,147 +2360,147 @@ msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -2691,7 +2724,7 @@ msgstr "密钥 %s：新密钥――已跳过\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
@@ -3234,8 +3267,8 @@ msgstr "我非常小心地检查过这把密钥。\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
@@ -3581,136 +3614,136 @@ msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗？(y/N)"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 msgid "Save changes? (y/N) "
 msgstr "要保存变动吗？(y/N)"
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而离开吗？(y/N)"
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 msgid "Notations: "
 msgstr "注记："
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2699
+#: g10/keyedit.c:2701
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2720
+#: g10/keyedit.c:2722
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3719,74 +3752,74 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签名吗？(y/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3795,193 +3828,193 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 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:3449
+#: g10/keyedit.c:3451
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3476
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签名\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签名的子钥 %s 已经交叉验证\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签名\n"
 
-#: g10/keyedit.c:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 msgid "Enter the notation: "
 msgstr "输入注记："
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N)"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签名已在 %s 过期。\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签名：\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4943
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
@@ -4673,7 +4706,7 @@ msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
@@ -5085,11 +5118,11 @@ msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "无法操作公钥算法 %d\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告：潜在不安全的对称加密会话密钥\n"
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
@@ -5448,12 +5481,12 @@ msgstr "%s：已跳过：公钥已被禁用\n"
 msgid "no valid addressees\n"
 msgstr "没有有效的地址\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
@@ -5675,7 +5708,7 @@ msgstr "建立了弱密钥――正在重试\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "对称加密无法避免生成弱密钥；已经尝试 %d 次！\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA 需要散列值长度为 8 位的倍数\n"
 
@@ -5778,48 +5811,48 @@ msgstr "检查已建立的签名时发生错误： %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签名来自：“%s”\n"
 
-#: g10/sign.c:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "正在签名："
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用！\n"
 
-#: g10/skclist.c:180
+#: g10/skclist.c:169
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "“%s”已跳过：重复\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "“%s”已跳过：%s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "已跳过：私钥已存在\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签名不安全！"
 
@@ -6191,67 +6224,77 @@ msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
 msgid "can't open fd %d: %s\n"
 msgstr "无法打开‘%s’： %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 #, fuzzy
 msgid "argument not expected"
 msgstr "不允许使用管理员命令\n"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 #, fuzzy
 msgid "read error"
 msgstr "文件读取错误"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 #, fuzzy
 msgid "keyword too long"
 msgstr "列太长"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 #, fuzzy
 msgid "missing argument"
 msgstr "无效的参数"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 #, fuzzy
 msgid "invalid command"
 msgstr "仅供管理员使用的命令\n"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "无效的列表选项\n"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "可选"
+
+#: jnlib/argparse.c:191
 #, fuzzy
 msgid "invalid option"
 msgstr "无效的列表选项\n"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "无效的指令(尝试“help”)\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "可选"
+
+#: jnlib/argparse.c:212
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "无效的列表选项\n"
@@ -6345,12 +6388,13 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
@@ -6362,103 +6406,103 @@ 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-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr "新的 PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "无法存储创建日期：%s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, fuzzy, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
@@ -6466,98 +6510,109 @@ msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 #. 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:1590
+#: scd/app-openpgp.c:1657
 msgid "|A|Admin PIN"
 msgstr "|A|管理员 PIN"
 
-#. 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管理员 PIN"
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "无法存储密钥：%s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr "请稍候，正在生成密钥……\n"
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "密钥已生成(耗时 %d 秒)\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡不支持散列算法 %s\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
@@ -6915,17 +6970,17 @@ msgstr ""
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, fuzzy, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n"
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7151,7 +7206,7 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr ""
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
 msgstr ""
 
 #: sm/decrypt.c:324
@@ -7379,12 +7434,12 @@ msgstr "%s 签名，散列算法 %s\n"
 msgid "|N|use compress algorithm N"
 msgstr "未知的压缩算法"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7395,60 +7450,60 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法：gpg [选项] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(不给定描述)\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = 跳过这把密钥\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7928,11 +7983,6 @@ msgstr "找不到公钥"
 msgid "No argument allowed"
 msgstr "不允许使用管理员命令\n"
 
-#: tools/no-libgcrypt.c:30
-#, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "建立钥匙环‘%s’时发生错误：%s\n"
-
 #: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6adf44438..ba2bb1761 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+0200\n"
 "PO-Revision-Date: 2008-03-26 22:35+0800\n"
 "Last-Translator: Jedi Lin <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -96,20 +96,20 @@ msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
 #: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
@@ -171,19 +171,33 @@ msgstr "前後不一致 - 請再試一次"
 msgid "failed to create stream from socket: %s\n"
 msgstr "從 socket 建立串流失敗: %s\n"
 
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr "管理者 PIN"
 
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "請再次輸入 PIN"
+
+#: agent/divert-scd.c:285
 msgid "Repeat this PIN"
 msgstr "請再次輸入 PIN"
 
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "前後兩次輸入的 PIN 不一致; 請再試一次"
+
+#: agent/divert-scd.c:291
 msgid "PIN not correctly repeated; try again"
 msgstr "前後兩次輸入的 PIN 不一致; 請再試一次"
 
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "請輸入 PIN%s%s%s 以解開卡片"
@@ -366,7 +380,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|檔案|將環境設定也寫至「檔案」"
 
 #: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "翻譯瑕疵請回報給 <[email protected]>, 程式瑕疵則請回報給 <"
@@ -383,30 +397,30 @@ msgstr ""
 "語法: gpg-agent [選項] [指令 [引數]]\n"
 "GnuPG 私鑰管理\n"
 
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "給定的除錯等級 `%s' 無效\n"
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項中\n"
@@ -1060,7 +1074,7 @@ msgstr "警告: 找到無效的標記資料\n"
 msgid "not human readable"
 msgstr "不是人類能讀得懂的"
 
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
@@ -1070,153 +1084,168 @@ msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "在 %s 模式中不允許使用這個指令.\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "私鑰部分無法取用\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
 #: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "你要選哪一個? "
 
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:465
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:418
+#: g10/card-util.c:466
 msgid "unspecified"
 msgstr "未特定"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "not forced"
 msgstr "不強迫使用"
 
-#: g10/card-util.c:445
+#: g10/card-util.c:493
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:574
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
 
-#: g10/card-util.c:525
+#: g10/card-util.c:576
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: 不能使用 \"<\" 字符.\n"
 
-#: g10/card-util.c:527
+#: g10/card-util.c:578
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:544
+#: g10/card-util.c:595
 msgid "Cardholder's surname: "
 msgstr "卡片持有者的姓氏: "
 
-#: g10/card-util.c:546
+#: g10/card-util.c:597
 msgid "Cardholder's given name: "
 msgstr "卡片持有者的名字: "
 
-#: g10/card-util.c:564
+#: g10/card-util.c:615
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:585
+#: g10/card-util.c:636
 msgid "URL to retrieve public key: "
 msgstr "取回公鑰的 URL: "
 
-#: g10/card-util.c:593
+#: g10/card-util.c:644
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "配置足夠的記憶體時出錯: %s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時出錯: %s\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:779
 msgid "Login data (account name): "
 msgstr "登入資料 (帳號名稱): "
 
-#: g10/card-util.c:709
+#: g10/card-util.c:789
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:768
+#: g10/card-util.c:824
 msgid "Private DO data: "
 msgstr "私人的 DO 資料: "
 
-#: g10/card-util.c:778
+#: g10/card-util.c:834
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:798
+#: g10/card-util.c:884
 msgid "Language preferences: "
 msgstr "介面語言偏好設定: "
 
-#: g10/card-util.c:806
+#: g10/card-util.c:892
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 無效的偏好設定字串長度\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:901
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
 
-#: g10/card-util.c:836
+#: g10/card-util.c:922
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性別 ((M)男性, (F)女性或留空): "
 
-#: g10/card-util.c:850
+#: g10/card-util.c:936
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:871
+#: g10/card-util.c:957
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:894
+#: g10/card-util.c:980
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 無效的格式化指紋.\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "不可能進行金鑰操作: %s\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
 msgid "not an OpenPGP card"
 msgstr "這不是 OpenPGP 卡片"
 
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得現用金鑰資訊時出錯: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
 msgid "Replace existing keys? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1227,120 +1256,124 @@ msgstr ""
 "   PIN = `%s'     管理者 PIN = `%s'\n"
 "你應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇你要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
 #: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
 msgid "Please select where to store the key:\n"
 msgstr "請選擇要把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
 msgid "unknown key protection algorithm\n"
 msgstr "未知的金鑰保護演算法\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
 msgid "secret parts of key are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放在卡片上了\n"
 
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "離開這個選單"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
 msgid "list all available data"
 msgstr "列出所有可用的資料"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
 msgid "change card holder's name"
 msgstr "變更卡片持有人的名字"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
 msgid "change URL to retrieve key"
 msgstr "變更取回金鑰的 URL"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
 msgid "fetch the key specified in the card URL"
 msgstr "從卡片 URL 取回指定的金鑰"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
 msgid "change the login name"
 msgstr "變更登入名稱"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
 msgid "change the language preferences"
 msgstr "變更介面語言偏好設定"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
 msgid "change card holder's sex"
 msgstr "變更卡片持有者的性別"
 
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
 msgid "change a CA fingerprint"
 msgstr "變更某個憑證中心 (CA) 的指紋"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
 msgid "toggle the signature force PIN flag"
 msgstr "切換簽章是否強制使用 PIN 的旗標"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
 msgid "menu to change or unblock the PIN"
 msgstr "變更或解凍 PIN 的選單"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
 msgid "verify the PIN and list all data"
 msgstr "驗證 PIN 並列出所有的資料"
 
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "指令> "
 
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
 msgid "Admin-only command\n"
 msgstr "限管理者使用的指令\n"
 
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
 msgid "Admin commands are allowed\n"
 msgstr "允許使用管理者指令\n"
 
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
@@ -1348,12 +1381,12 @@ msgstr "無效的指令  (試試看 \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1399,7 +1432,7 @@ msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語時出錯: %s\n"
@@ -1418,7 +1451,7 @@ msgstr "正在使用 %s 編密法\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是個空檔案\n"
@@ -1443,7 +1476,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1629,7 +1662,7 @@ msgstr "憑證中心 (CA) 指紋: "
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
@@ -1874,7 +1907,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1886,7 +1919,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
 msgid "Cipher: "
 msgstr "編密法: "
 
@@ -1894,11 +1927,11 @@ msgstr "編密法: "
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr "已使用的函示庫:"
 
@@ -1906,7 +1939,7 @@ msgstr "已使用的函示庫:"
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
@@ -2051,7 +2084,7 @@ msgstr "`%s' 不是個有效的簽章使用期限\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是個有效的字元集\n"
 
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URL\n"
 
@@ -2158,7 +2191,7 @@ msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
@@ -2198,11 +2231,11 @@ msgstr "啟用 --pgp2 時你祇應該使用檔案, 而非管道\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
@@ -2278,147 +2311,147 @@ msgstr "你不該將 `%s' 摘要演算法用於 %s 模式中\n"
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 壓縮演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3346
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3378
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3433
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3486
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器失敗: %s\n"
 
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收失敗: %s\n"
 
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "用金鑰伺服器搜尋失敗: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新失敗: %s\n"
 
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始輸入你的訊息 ...\n"
 
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -2642,7 +2675,7 @@ msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫入的鑰匙圈: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "寫入 `%s' 中\n"
@@ -3189,8 +3222,8 @@ msgstr "我非常小心地檢查過這把金鑰了.\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗: %s\n"
@@ -3536,115 +3569,115 @@ msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好設定嗎? (y/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
 msgid "Save changes? (y/N) "
 msgstr "要儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
 msgid "Quit without saving? (y/N) "
 msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
 msgid "Notations: "
 msgstr "註記: "
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
 
-#: g10/keyedit.c:2699
+#: g10/keyedit.c:2701
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
 
-#: g10/keyedit.c:2720
+#: g10/keyedit.c:2722
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
 
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2728
 msgid "(sensitive)"
 msgstr "(機密)"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:196 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "建立: %s"
 
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
 #, c-format
 msgid "expired: %s"
 msgstr "過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
 #: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
 #: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "到期: %s"
 
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
 #, c-format
 msgid "usage: %s"
 msgstr "用途: %s"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
 msgid "This key has been disabled"
 msgstr "這把金鑰已經停用了"
 
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3652,17 +3685,17 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非你重新執行程式.\n"
 
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
 #: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
 #: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
 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"
@@ -3670,7 +3703,7 @@ msgstr ""
 "警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
 "      導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:3021
+#: g10/keyedit.c:3023
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3679,74 +3712,74 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "你確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這份完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這份無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這份未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這份自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已經刪除了 %d 份簽章.\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已經刪除了 %d 份簽章.\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
 msgid "Nothing deleted.\n"
 msgstr "沒有刪除任何東西.\n"
 
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "使用者 ID \"%s\" 已精簡: %s\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "使用者 ID \"%s\": 已經最小化了\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3755,190 +3788,190 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3387
+#: g10/keyedit.c:3389
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
 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:3427
+#: g10/keyedit.c:3429
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3449
+#: g10/keyedit.c:3451
 msgid "this key has already been designated as a revoker\n"
 msgstr "已指定這把金鑰為撤銷者了\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3476
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把子鑰.\n"
 
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更子鑰的使用期限.\n"
 
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "你不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3610
+#: g10/keyedit.c:3612
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "簽署子鑰 %s 已經交叉認證過了\n"
 
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
 
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
 msgid "Please select exactly one user ID.\n"
 msgstr "請祇選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:4067
+#: g10/keyedit.c:4069
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入你的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "你確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "你確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
 msgid "Enter the notation: "
 msgstr "請輸入註記: "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
 msgid "Proceed? (y/N) "
 msgstr "是否繼續? (y/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到子鑰\n"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
 
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽章已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "你確定仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
 msgid "You are about to revoke these signatures:\n"
 msgstr "你正要撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已撤銷\n"
 
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:4943
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@ -4630,7 +4663,7 @@ msgstr "警告: 金鑰伺服器經手程式係來自不同版本的 GnuPG (%s)\n
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
@@ -5041,11 +5074,11 @@ msgstr "警告: 在 `%s' 裡的選項於這次執行期間並沒有被啟用\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "無法操作 %d 公開金鑰演算法\n"
 
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
 
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
@@ -5409,12 +5442,12 @@ msgstr "%s: 已跳過: 公鑰已停用\n"
 msgid "no valid addressees\n"
 msgstr "沒有有效的地址\n"
 
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
 
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
@@ -5637,7 +5670,7 @@ msgstr "建立了弱金鑰 - 重試中\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
 
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA 需要 8 位元倍數的雜湊長度\n"
 
@@ -5740,48 +5773,48 @@ msgstr "檢查已建立的簽章時出錯: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
 
-#: g10/sign.c:760
+#: g10/sign.c:758
 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:836
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
-#: g10/sign.c:963
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1078
+#: g10/sign.c:1076
 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:1262
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
 
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
 
-#: g10/skclist.c:180
+#: g10/skclist.c:169
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "已跳過 \"%s\": 重複了\n"
 
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳過 \"%s\": %s\n"
 
-#: g10/skclist.c:193
+#: g10/skclist.c:182
 msgid "skipped: secret key already present\n"
 msgstr "已跳過: 私鑰已經存在\n"
 
-#: g10/skclist.c:208
+#: g10/skclist.c:197
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 
@@ -6152,60 +6185,70 @@ msgstr "輸入列 %u 太長或者列末的 LF 遺失了\n"
 msgid "can't open fd %d: %s\n"
 msgstr "無法開啟 fd %d: %s\n"
 
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
 msgid "argument not expected"
 msgstr "沒料到有引數"
 
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
 msgid "read error"
 msgstr "讀取錯誤"
 
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
 msgid "keyword too long"
 msgstr "關鍵字太長"
 
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
 msgid "missing argument"
 msgstr "無效的引數"
 
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
 msgid "invalid command"
 msgstr "無效的指令"
 
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
 msgid "invalid alias definition"
 msgstr "無效的別名定義"
 
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "[錯誤 - 超出核心]"
+
+#: jnlib/argparse.c:191
 msgid "invalid option"
 msgstr "無效的選項"
 
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "\"%.50s\" 選項遺失了引數\n"
 
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "\"%.50s\" 選項沒料到會有引數\n"
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "無效的指令 \"%.50s\"\n"
 
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "\"%.50s\" 選項不明確\n"
 
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "\"%.50s\" 指令不明確\n"
 
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "[錯誤 - 超出核心]"
+
+#: jnlib/argparse.c:212
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "無效的選項 \"%.50s\"\n"
@@ -6297,12 +6340,13 @@ msgstr ""
 "語法: kbxutil [選項] [檔案]\n"
 "列出, 匯出, 匯入金鑰鑰匙盒資料\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||請在讀卡機鍵盤上輸入你的 PIN"
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "收回 PIN 時傳回錯誤: %s\n"
@@ -6314,201 +6358,212 @@ msgstr "NullPIN 還沒有變更過\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.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
 msgid "|N|New PIN"
 msgstr "|N|新增 PIN"
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的 PIN 時出錯: %s\n"
 
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生日期失敗: %s\n"
 
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||請在讀卡機鍵盤上輸入你的 PIN%%0A[簽署完成: %lu]"
 
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1479
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "用於 CHV%d 的 PIN 太短; 長度最少要有 %d\n"
 
-#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV%d 失敗: %s\n"
 
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
 msgid "access to admin commands is not configured\n"
 msgstr "管理者指令存取權限尚未組態\n"
 
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
 msgid "card is permanently locked!\n"
 msgstr "卡片永久鎖定了!!\n"
 
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d 管理者 PIN 試圖在卡片永久鎖定前遺留下來\n"
 
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr "|A|請在讀卡機鍵盤上輸入管理者 PIN%%0A[剩餘嘗試次數: %d]"
 
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "|A|請在讀卡機鍵盤上輸入管理者 PIN"
 
 #. 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:1590
+#: scd/app-openpgp.c:1657
 msgid "|A|Admin PIN"
 msgstr "|A|管理者 PIN"
 
-#. 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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "請輸入 PIN%s%s%s 以解開卡片"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "用於 CHV%d 的 PIN 太短; 長度最少要有 %d\n"
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新增管理者 PIN"
 
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被取代\n"
 
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
 msgid "creation timestamp missing\n"
 msgstr "缺漏創生時間戳印\n"
 
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
 
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
 
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
 msgid "please wait while key is being generated ...\n"
 msgstr "正在產生金鑰中, 請稍候 ...\n"
 
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "金鑰產生完畢 (%d 秒)\n"
 
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
 msgid "fingerprint on card does not match requested one\n"
 msgstr "卡片上的指紋與所要求的那個並不吻合\n"
 
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡片不支援 %s 摘要演算法\n"
 
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
 
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -6845,17 +6900,17 @@ msgstr "切換至鏈模型"
 msgid "validation model used: %s"
 msgstr "已使用的驗證模型: %s"
 
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "金鑰 %s 使用不安全 (%u 位元) 的雜湊\n"
 
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u 位元的雜湊對 %u 位元的 %s 金鑰來說是無效的\n"
 
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(這是 MD2 演算法)\n"
 
@@ -7070,7 +7125,8 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr "準備好了.  你現在就該把此請求送到你的 CA.\n"
 
 #: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+#, fuzzy
+msgid "resource problem: out of core\n"
 msgstr "資源問題: 超出核心\n"
 
 #: sm/decrypt.c:324
@@ -7279,11 +7335,11 @@ msgstr "|名稱|使用「名稱」訊息摘要演算法"
 msgid "|N|use compress algorithm N"
 msgstr "|N|使用壓縮演算法 N"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法: gpgsm [選項] [檔案] (或用 -h 求助)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7293,59 +7349,59 @@ msgstr ""
 "用 S/MIME 協定來簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
 msgid "usage: gpgsm [options] "
 msgstr "用法: gpgsm [選項] "
 
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "請注意: 將無法加密為 `%s': %s\n"
 
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "未知的驗證模型 `%s'\n"
 
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "第 %d 列: 沒有給定的物件名稱\n"
 
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = 跳過這把金鑰\n"
 
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "無法剖析金鑰伺服器 URL\n"
 
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
 msgid "WARNING: running with faked system time: "
 msgstr "警告: 正在偽造的系統時間中執行: "
 
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "正在匯入通用憑證 `%s'\n"
 
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "無法用 `%s' 來簽署: %s\n"
 
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
 msgid "this command has not yet been implemented\n"
 msgstr "這個指令尚未實做完成\n"
 
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7818,11 +7874,6 @@ msgstr "找不到元件"
 msgid "No argument allowed"
 msgstr "未允許使用引數"
 
-#: tools/no-libgcrypt.c:30
-#, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "配置足夠的記憶體時出錯: %s\n"
-
 #: tools/symcryptrun.c:152
 msgid ""
 "@\n"
diff --git a/scd/ChangeLog b/scd/ChangeLog
index dec9d87d5..85177e535 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,45 @@
+2008-10-14  Werner Koch  <[email protected]>
+
+
+	* apdu.c (reader_table_s): Add fields connect_card and
+	disconnect_card.
+	(new_reader_slot): Set them to NULL.
+	(apdu_connect, apdu_disconnect): New.
+	(apdu_close_reader, apdu_shutdown_reader): Call apdu_disconnect.
+	(connect_pcsc_card, disconnect_pcsc_card): new.
+	(reset_pcsc_reader_direct): Implement in terms of
+	disconnect_pcsc_card and connect_pcsc_card.
+	(apdu_get_atr): Return NULL if there is no ATR.
+	* sc-copykeys.c (main): Add call to apdu_connect.
+	* command.c (open_card): Ditto.
+
+	* apdu.h (SW_HOST_ALREADY_CONNECTED): New.
+	(APDU_CARD_USABLE, APDU_CARD_PRESENT, APDU_CARD_ACTIVE): New.
+	* apdu.c: Replace constants by the new macros.
+	(open_pcsc_reader): Factor  code out to ...
+	(open_pcsc_reader_direct, open_pcsc_reader_wrapped): New.
+	(reset_pcsc_reader): Factor code out to ...
+	(reset_pcsc_reader_direct, reset_pcsc_reader_wrapped): New.
+	(pcsc_get_status): Factor code out to ...
+	(pcsc_get_status_direct, pcsc_get_status_wrapped): New.
+	(pcsc_send_apdu): Factor code out to ...
+	(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped): New.
+	(close_pcsc_reader): Factor code out to ...
+	(close_pcsc_reader_direct, close_pcsc_reader_wrapped): New.
+
+	* command.c (update_reader_status_file): Open the reader if not
+	yet done.
+
+	* scdaemon.c (TIMERTICK_INTERVAL_SEC, TIMERTICK_INTERVAL_USEC):
+	New to replace TIMERTICK_INTERVAL.  Chnage from 2s (4 under W32)
+	to 250ms.
+
+2008-10-13  Werner Koch  <[email protected]>
+
+	* command.c (option_handler) [W32]: Use strtoul with base 16.
+	(update_reader_status_file) [W32]: Set Event.
+	(scd_command_handler): Use INT2FD to silent warning.
+
 2008-09-29  Werner Koch  <[email protected]>
 
 	* scdaemon.h (GCRY_MD_USER): Rename to GCRY_MODULE_ID_USER.
diff --git a/scd/apdu.c b/scd/apdu.c
index 38a400bdf..c0c5c5d3e 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -103,6 +103,8 @@ struct reader_table_s {
   unsigned short port; /* Port number:  0 = unused, 1 - dev/tty */
 
   /* Function pointers intialized to the various backends.  */
+  int (*connect_card)(int);
+  int (*disconnect_card)(int);
   int (*close_reader)(int);
   int (*shutdown_reader)(int);
   int (*reset_reader)(int);
@@ -291,6 +293,7 @@ long (* DLSTDCALL pcsc_set_timeout) (unsigned long context,
 
 /*  Prototypes.  */
 static int pcsc_get_status (int slot, unsigned int *status);
+static int reset_pcsc_reader (int slot);
 
 
 
@@ -327,6 +330,8 @@ new_reader_slot (void)
       reader_table[reader].lock_initialized = 1;
     }
 #endif /*USE_GNU_PTH*/
+  reader_table[reader].connect_card = NULL;
+  reader_table[reader].disconnect_card = NULL;
   reader_table[reader].close_reader = NULL;
   reader_table[reader].shutdown_reader = NULL;
   reader_table[reader].reset_reader = NULL;
@@ -386,6 +391,7 @@ host_sw_string (long err)
     case SW_HOST_NO_READER: return "no reader";
     case SW_HOST_ABORTED: return "aborted";
     case SW_HOST_NO_KEYPAD: return "no keypad"; 
+    case SW_HOST_ALREADY_CONNECTED: return "already connected"; 
     default: return "unknown host status error";
     }
 }
@@ -536,10 +542,10 @@ reset_ct_reader (int slot)
 static int
 ct_get_status (int slot, unsigned int *status)
 {
-  *status = 1|2|4;  /* FIXME */
+  /* The status we returned is wrong but we don't care becuase ctAPI
+     is not anymore required.  */
+  *status = APDU_CARD_USABLE|APDU_CARD_PRESENT|APDU_CARD_ACTIVE;
   return 0;
-
-  return SW_HOST_NOT_SUPPORTED;
 }
 
 /* Actually send the APDU of length APDULEN to SLOT and return a
@@ -767,178 +773,87 @@ pcsc_error_to_sw (long ec)
 static void
 dump_pcsc_reader_status (int slot)
 {
-  log_info ("reader slot %d: active protocol:", slot);
-  if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T0))
-    log_printf (" T0");
-  else if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1))
-    log_printf (" T1");
-  else if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_RAW))
-    log_printf (" raw");
-  log_printf ("\n");
+  if (reader_table[slot].pcsc.card)
+    {
+      log_info ("reader slot %d: active protocol:", slot);
+      if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T0))
+        log_printf (" T0");
+      else if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1))
+        log_printf (" T1");
+      else if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_RAW))
+        log_printf (" raw");
+      log_printf ("\n");
+    }
+  else
+    log_info ("reader slot %d: not connected\n", slot);
 }
 
 
-/* Send an PC/SC reset command and return a status word on error or 0
-   on success. */
+#ifndef NEED_PCSC_WRAPPER
 static int
-reset_pcsc_reader (int slot)
+pcsc_get_status_direct (int slot, unsigned int *status)
 {
-#ifdef NEED_PCSC_WRAPPER
   long err;
-  reader_table_t slotp;
-  size_t len;
-  int i, n;
-  unsigned char msgbuf[9];
-  unsigned int dummy_status;
-  int sw = SW_HOST_CARD_IO_ERROR;
-
-  slotp = reader_table + slot;
-
-  if (slotp->pcsc.req_fd == -1
-      || slotp->pcsc.rsp_fd == -1
-      || slotp->pcsc.pid == (pid_t)(-1) )
-    {
-      log_error ("pcsc_get_status: pcsc-wrapper not running\n");
-      return sw;
-    }
-
-  msgbuf[0] = 0x05; /* RESET command. */
-  len = 0;
-  msgbuf[1] = (len >> 24);
-  msgbuf[2] = (len >> 16);
-  msgbuf[3] = (len >>  8);
-  msgbuf[4] = (len      );
-  if ( writen (slotp->pcsc.req_fd, msgbuf, 5) )
-    {
-      log_error ("error sending PC/SC RESET request: %s\n",
-                 strerror (errno));
-      goto command_failed;
-    }
+  struct pcsc_readerstate_s rdrstates[1];
 
-  /* Read the response. */
-  if ((i=readn (slotp->pcsc.rsp_fd, msgbuf, 9, &len)) || len != 9)
-    {
-      log_error ("error receiving PC/SC RESET response: %s\n",
-                 i? strerror (errno) : "premature EOF");
-      goto command_failed;
-    }
-  len = (msgbuf[1] << 24) | (msgbuf[2] << 16) | (msgbuf[3] << 8 ) | msgbuf[4];
-  if (msgbuf[0] != 0x81 || len < 4)
-    {
-      log_error ("invalid response header from PC/SC received\n");
-      goto command_failed;
-    }
-  len -= 4; /* Already read the error code. */
-  if (len > DIM (slotp->atr))
-    {
-      log_error ("PC/SC returned a too large ATR (len=%lx)\n",
-                 (unsigned long)len);
-      sw = SW_HOST_GENERAL_ERROR;
-      goto command_failed;
-    }
-  err = PCSC_ERR_MASK ((msgbuf[5] << 24) | (msgbuf[6] << 16)
-                       | (msgbuf[7] << 8 ) | msgbuf[8]);
+  memset (rdrstates, 0, sizeof *rdrstates);
+  rdrstates[0].reader = reader_table[slot].rdrname;
+  rdrstates[0].current_state = PCSC_STATE_UNAWARE;
+  err = pcsc_get_status_change (reader_table[slot].pcsc.context,
+                                0,
+                                rdrstates, 1);
+  if (err == PCSC_E_TIMEOUT)
+    err = 0; /* Timeout is no error error here. */
   if (err)
     {
-      log_error ("PC/SC RESET failed: %s (0x%lx)\n",
+      log_error ("pcsc_get_status_change failed: %s (0x%lx)\n",
                  pcsc_error_string (err), err);
-      /* If the error code is no smart card, we should not considere
-         this a major error and close the wrapper.  */
-      sw = pcsc_error_to_sw (err);
-      if (err == PCSC_E_NO_SMARTCARD)
-        return sw;
-      goto command_failed;
-    }
-
-  /* The open function may return a zero for the ATR length to
-     indicate that no card is present.  */
-  n = len;
-  if (n)
-    {
-      if ((i=readn (slotp->pcsc.rsp_fd, slotp->atr, n, &len)) || len != n)
-        {
-          log_error ("error receiving PC/SC RESET response: %s\n",
-                     i? strerror (errno) : "premature EOF");
-          goto command_failed;
-        }
-    }
-  slotp->atrlen = len;
-
-  /* Read the status so that IS_T0 will be set. */
-  pcsc_get_status (slot, &dummy_status);
-
-  return 0;
-
- command_failed:
-  close (slotp->pcsc.req_fd);
-  close (slotp->pcsc.rsp_fd);
-  slotp->pcsc.req_fd = -1;
-  slotp->pcsc.rsp_fd = -1;
-  kill (slotp->pcsc.pid, SIGTERM);
-  slotp->pcsc.pid = (pid_t)(-1);
-  slotp->used = 0;
-  return sw;
-
-#else /* !NEED_PCSC_WRAPPER */
-  long err;
-  char reader[250];
-  unsigned long nreader, atrlen;
-  unsigned long card_state, card_protocol;
-
-  if (reader_table[slot].pcsc.card)
-    {
-      err = pcsc_disconnect (reader_table[slot].pcsc.card, PCSC_LEAVE_CARD);
-      if (err)
-        {
-          log_error ("pcsc_disconnect failed: %s (0x%lx)\n",
-                     pcsc_error_string (err), err);
-          return SW_HOST_CARD_IO_ERROR;
-        }
-      reader_table[slot].pcsc.card = 0;
-    }
-
-  err = pcsc_connect (reader_table[slot].pcsc.context,
-                      reader_table[slot].rdrname,
-                      PCSC_SHARE_EXCLUSIVE,
-                      PCSC_PROTOCOL_T0|PCSC_PROTOCOL_T1,
-                      &reader_table[slot].pcsc.card,
-                      &reader_table[slot].pcsc.protocol);
-  if (err)
-    {
-      log_error ("pcsc_connect failed: %s (0x%lx)\n",
-                  pcsc_error_string (err), err);
-      reader_table[slot].pcsc.card = 0;
       return pcsc_error_to_sw (err);
     }
 
+  /*   log_debug  */
+  /*     ("pcsc_get_status_change: %s%s%s%s%s%s%s%s%s%s\n", */
+  /*      (rdrstates[0].event_state & PCSC_STATE_IGNORE)? " ignore":"", */
+  /*      (rdrstates[0].event_state & PCSC_STATE_CHANGED)? " changed":"", */
+  /*      (rdrstates[0].event_state & PCSC_STATE_UNKNOWN)? " unknown":"", */
+  /*      (rdrstates[0].event_state & PCSC_STATE_UNAVAILABLE)?" unavail":"", */
+  /*      (rdrstates[0].event_state & PCSC_STATE_EMPTY)? " empty":"", */
+  /*      (rdrstates[0].event_state & PCSC_STATE_PRESENT)? " present":"", */
+  /*      (rdrstates[0].event_state & PCSC_STATE_ATRMATCH)? " atr":"", */
+  /*      (rdrstates[0].event_state & PCSC_STATE_EXCLUSIVE)? " excl":"", */
+  /*      (rdrstates[0].event_state & PCSC_STATE_INUSE)? " unuse":"", */
+  /*      (rdrstates[0].event_state & PCSC_STATE_MUTE)? " mute":"" ); */
 
-  atrlen = DIM(reader_table[0].atr);
-  nreader = sizeof reader - 1;
-  err = pcsc_status (reader_table[slot].pcsc.card,
-                     reader, &nreader,
-                     &card_state, &card_protocol,
-                     reader_table[slot].atr, &atrlen);
-  if (err)
-    {
-      log_error ("pcsc_status failed: %s (0x%lx)\n",
-                  pcsc_error_string (err), err);
-      reader_table[slot].atrlen = 0;
-      return pcsc_error_to_sw (err);
-    }
-  if (atrlen > DIM (reader_table[0].atr))
-    log_bug ("ATR returned by pcsc_status is too large\n");
-  reader_table[slot].atrlen = atrlen;
-  reader_table[slot].is_t0 = !!(card_protocol & PCSC_PROTOCOL_T0);
+  *status = 0;
+  if ( (rdrstates[0].event_state & PCSC_STATE_PRESENT) )
+    *status |= APDU_CARD_PRESENT;
+  if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) )
+    *status |= APDU_CARD_ACTIVE;
+#ifndef HAVE_W32_SYSTEM
+  /* We indicate a useful card if it is not in use by another
+     application.  This is because we only use exclusive access
+     mode.  */
+  if ( (*status & (APDU_CARD_PRESENT|APDU_CARD_ACTIVE))
+       == (APDU_CARD_PRESENT|APDU_CARD_ACTIVE)
+       && !(rdrstates[0].event_state & PCSC_STATE_INUSE) )
+    *status |= APDU_CARD_USABLE;
+#else
+  /* Some winscard drivers may set EXCLUSIVE and INUSE at the same
+     time when we are the only user (SCM SCR335) under Windows.  */
+  if ((*status & (APDU_CARD_PRESENT|APDU_CARD_ACTIVE))
+      == (APDU_CARD_PRESENT|APDU_CARD_ACTIVE))
+    *status |= APDU_CARD_USABLE;
+#endif
 
   return 0;
-#endif /* !NEED_PCSC_WRAPPER */
 }
+#endif /*!NEED_PCSC_WRAPPER*/
 
 
+#ifdef NEED_PCSC_WRAPPER
 static int
-pcsc_get_status (int slot, unsigned int *status)
+pcsc_get_status_wrapped (int slot, unsigned int *status)
 {
-#ifdef NEED_PCSC_WRAPPER
   long err;
   reader_table_t slotp;
   size_t len, full_len;
@@ -1030,7 +945,6 @@ pcsc_get_status (int slot, unsigned int *status)
   /* We are lucky: The wrapper already returns the data in the
      required format. */
   *status = buffer[3];
-
   return 0;
 
  command_failed:
@@ -1042,74 +956,63 @@ pcsc_get_status (int slot, unsigned int *status)
   slotp->pcsc.pid = (pid_t)(-1);
   slotp->used = 0;
   return sw;
+}
+#endif /*NEED_PCSC_WRAPPER*/
 
-#else /*!NEED_PCSC_WRAPPER*/
 
-  long err;
-  struct pcsc_readerstate_s rdrstates[1];
+static int
+pcsc_get_status (int slot, unsigned int *status)
+{
+#ifdef NEED_PCSC_WRAPPER
+  return pcsc_get_status_wrapped (slot, status);
+#else
+  return pcsc_get_status_direct (slot, status);
+#endif
+}
 
-  memset (rdrstates, 0, sizeof *rdrstates);
-  rdrstates[0].reader = reader_table[slot].rdrname;
-  rdrstates[0].current_state = PCSC_STATE_UNAWARE;
-  err = pcsc_get_status_change (reader_table[slot].pcsc.context,
-                                0,
-                                rdrstates, 1);
-  if (err == PCSC_E_TIMEOUT)
-    err = 0; /* Timeout is no error error here. */
-  if (err)
-    {
-      log_error ("pcsc_get_status_change failed: %s (0x%lx)\n",
-                 pcsc_error_string (err), err);
-      return pcsc_error_to_sw (err);
-    }
 
+#ifndef NEED_PCSC_WRAPPER
+static int
+pcsc_send_apdu_direct (int slot, unsigned char *apdu, size_t apdulen,
+                       unsigned char *buffer, size_t *buflen, 
+                       struct pininfo_s *pininfo)
+{
+  long err;
+  struct pcsc_io_request_s send_pci;
+  unsigned long recv_len;
+
+  if (!reader_table[slot].atrlen
+      && (err = reset_pcsc_reader (slot)))
+    return err;
 
-  /*   log_debug  */
-  /*     ("pcsc_get_status_change: %s%s%s%s%s%s%s%s%s%s\n", */
-  /*      (rdrstates[0].event_state & PCSC_STATE_IGNORE)? " ignore":"", */
-  /*      (rdrstates[0].event_state & PCSC_STATE_CHANGED)? " changed":"", */
-  /*      (rdrstates[0].event_state & PCSC_STATE_UNKNOWN)? " unknown":"", */
-  /*      (rdrstates[0].event_state & PCSC_STATE_UNAVAILABLE)?" unavail":"", */
-  /*      (rdrstates[0].event_state & PCSC_STATE_EMPTY)? " empty":"", */
-  /*      (rdrstates[0].event_state & PCSC_STATE_PRESENT)? " present":"", */
-  /*      (rdrstates[0].event_state & PCSC_STATE_ATRMATCH)? " atr":"", */
-  /*      (rdrstates[0].event_state & PCSC_STATE_EXCLUSIVE)? " excl":"", */
-  /*      (rdrstates[0].event_state & PCSC_STATE_INUSE)? " unuse":"", */
-  /*      (rdrstates[0].event_state & PCSC_STATE_MUTE)? " mute":"" ); */
+  if (DBG_CARD_IO)
+    log_printhex ("  PCSC_data:", apdu, apdulen);
 
-  *status = 0;
-  if ( (rdrstates[0].event_state & PCSC_STATE_PRESENT) )
-    *status |= 2;
-  if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) )
-    *status |= 4;
-#ifndef HAVE_W32_SYSTEM
-  /* We indicate a useful card if it is not in use by another
-     application.  This is because we only use exclusive access
-     mode.  */
-  if ( (*status & 6) == 6
-       && !(rdrstates[0].event_state & PCSC_STATE_INUSE) )
-    *status |= 1;
-#else
-  /* Some winscard drivers may set EXCLUSIVE and INUSE at the same
-     time when we are the only user (SCM SCR335) under Windows.  */
-  if ((*status & 6) == 6)
-    *status |= 1;
-#endif
+  if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1))
+      send_pci.protocol = PCSC_PROTOCOL_T1;
+  else
+      send_pci.protocol = PCSC_PROTOCOL_T0;
+  send_pci.pci_len = sizeof send_pci;
+  recv_len = *buflen;
+  err = pcsc_transmit (reader_table[slot].pcsc.card,
+                       &send_pci, apdu, apdulen,
+                       NULL, buffer, &recv_len);
+  *buflen = recv_len;
+  if (err)
+    log_error ("pcsc_transmit failed: %s (0x%lx)\n",
+               pcsc_error_string (err), err);
 
-  return 0;
-#endif /*!NEED_PCSC_WRAPPER*/
+  return pcsc_error_to_sw (err);
 }
+#endif /*!NEED_PCSC_WRAPPER*/
 
 
-/* Actually send the APDU of length APDULEN to SLOT and return a
-   maximum of *BUFLEN data in BUFFER, the actual returned size will be
-   set to BUFLEN.  Returns: CT API error code. */
+#ifdef NEED_PCSC_WRAPPER
 static int
-pcsc_send_apdu (int slot, unsigned char *apdu, size_t apdulen,
-                unsigned char *buffer, size_t *buflen, 
-                struct pininfo_s *pininfo)
+pcsc_send_apdu_wrapped (int slot, unsigned char *apdu, size_t apdulen,
+                        unsigned char *buffer, size_t *buflen, 
+                        struct pininfo_s *pininfo)
 {
-#ifdef NEED_PCSC_WRAPPER
   long err;
   reader_table_t slotp;
   size_t len, full_len;
@@ -1215,43 +1118,43 @@ pcsc_send_apdu (int slot, unsigned char *apdu, size_t apdulen,
   slotp->pcsc.pid = (pid_t)(-1);
   slotp->used = 0;
   return sw;
+}
+#endif /*NEED_PCSC_WRAPPER*/
 
-#else /*!NEED_PCSC_WRAPPER*/
-
-  long err;
-  struct pcsc_io_request_s send_pci;
-  unsigned long recv_len;
-
-  if (!reader_table[slot].atrlen
-      && (err = reset_pcsc_reader (slot)))
-    return err;
 
-  if (DBG_CARD_IO)
-    log_printhex ("  PCSC_data:", apdu, apdulen);
+/* Send the APDU of length APDULEN to SLOT and return a maximum of
+   *BUFLEN data in BUFFER, the actual returned size will be stored at
+   BUFLEN.  Returns: A status word. */
+static int
+pcsc_send_apdu (int slot, unsigned char *apdu, size_t apdulen,
+                unsigned char *buffer, size_t *buflen, 
+                struct pininfo_s *pininfo)
+{
+#ifdef NEED_PCSC_WRAPPER
+  return pcsc_send_apdu_wrapped (slot, apdu, apdulen, buffer, buflen, pininfo);
+#else
+  return pcsc_send_apdu_direct (slot, apdu, apdulen, buffer, buflen, pininfo);
+#endif
+}
 
-  if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1))
-      send_pci.protocol = PCSC_PROTOCOL_T1;
-  else
-      send_pci.protocol = PCSC_PROTOCOL_T0;
-  send_pci.pci_len = sizeof send_pci;
-  recv_len = *buflen;
-  err = pcsc_transmit (reader_table[slot].pcsc.card,
-                       &send_pci, apdu, apdulen,
-                       NULL, buffer, &recv_len);
-  *buflen = recv_len;
-  if (err)
-    log_error ("pcsc_transmit failed: %s (0x%lx)\n",
-               pcsc_error_string (err), err);
 
-  return pcsc_error_to_sw (err);
-#endif /*!NEED_PCSC_WRAPPER*/
+#ifndef NEED_PCSC_WRAPPER
+static int
+close_pcsc_reader_direct (int slot)
+{
+  pcsc_release_context (reader_table[slot].pcsc.context);
+  xfree (reader_table[slot].rdrname);
+  reader_table[slot].rdrname = NULL;
+  reader_table[slot].used = 0;
+  return 0;
 }
+#endif /*!NEED_PCSC_WRAPPER*/
 
 
+#ifdef NEED_PCSC_WRAPPER
 static int
-close_pcsc_reader (int slot)
+close_pcsc_reader_wrapped (int slot)
 {
-#ifdef NEED_PCSC_WRAPPER
   long err;
   reader_table_t slotp;
   size_t len;
@@ -1313,25 +1216,349 @@ close_pcsc_reader (int slot)
   slotp->pcsc.pid = (pid_t)(-1);
   slotp->used = 0;
   return 0;
+}
+#endif /*NEED_PCSC_WRAPPER*/
 
-#else /*!NEED_PCSC_WRAPPER*/
 
-  pcsc_release_context (reader_table[slot].pcsc.context);
-  xfree (reader_table[slot].rdrname);
-  reader_table[slot].rdrname = NULL;
-  reader_table[slot].used = 0;
+static int
+close_pcsc_reader (int slot)
+{
+#ifdef NEED_PCSC_WRAPPER
+  return close_pcsc_reader_wrapped (slot);
+#else
+  return close_pcsc_reader_direct (slot);
+#endif
+}
+
+
+/* Connect a PC/SC card.  */
+#ifndef NEED_PCSC_WRAPPER
+static int
+connect_pcsc_card (int slot)
+{
+  long err;
+
+  assert (slot >= 0 && slot < MAX_READER);
+
+  if (reader_table[slot].pcsc.card)
+    return SW_HOST_ALREADY_CONNECTED;
+
+  reader_table[slot].atrlen = 0;
+  reader_table[slot].last_status = 0;
+  reader_table[slot].is_t0 = 0;
+
+  err = pcsc_connect (reader_table[slot].pcsc.context,
+                      reader_table[slot].rdrname,
+                      PCSC_SHARE_EXCLUSIVE,
+                      PCSC_PROTOCOL_T0|PCSC_PROTOCOL_T1,
+                      &reader_table[slot].pcsc.card,
+                      &reader_table[slot].pcsc.protocol);
+  if (err)
+    {
+      reader_table[slot].pcsc.card = 0;
+      if (err != PCSC_E_NO_SMARTCARD) 
+        log_error ("pcsc_connect failed: %s (0x%lx)\n",
+                   pcsc_error_string (err), err);
+    }
+  else
+    {
+      char reader[250];
+      unsigned long readerlen, atrlen;
+      unsigned long card_state, card_protocol;
+
+      atrlen = DIM (reader_table[0].atr);
+      readerlen = sizeof reader -1 ;
+      err = pcsc_status (reader_table[slot].pcsc.card,
+                         reader, &readerlen,
+                         &card_state, &card_protocol,
+                         reader_table[slot].atr, &atrlen);
+      if (err)
+        log_error ("pcsc_status failed: %s (0x%lx) %lu\n",
+                   pcsc_error_string (err), err, readerlen);
+      else
+        {
+          if (atrlen > DIM (reader_table[0].atr))
+            log_bug ("ATR returned by pcsc_status is too large\n");
+          reader_table[slot].atrlen = atrlen;
+          /* If we got to here we know that a card is present
+             and usable.  Remember this.  */
+          reader_table[slot].last_status = (   APDU_CARD_USABLE
+                                             | APDU_CARD_PRESENT
+                                             | APDU_CARD_ACTIVE
+                                             | 0x8000);
+          reader_table[slot].is_t0 = !!(card_protocol & PCSC_PROTOCOL_T0);
+        }
+    }
+
+  dump_reader_status (slot);
+  return pcsc_error_to_sw (err);
+}
+#endif /*!NEED_PCSC_WRAPPER*/
+
+
+/* Disconnect a PC/SC card.  Note that this succeeds even if the card
+   is not connected.  */
+#ifndef NEED_PCSC_WRAPPER
+static int
+disconnect_pcsc_card (int slot)
+{
+  long err;
+
+  assert (slot >= 0 && slot < MAX_READER);
+
+  if (!reader_table[slot].pcsc.card)
+    return 0; 
+
+  err = pcsc_disconnect (reader_table[slot].pcsc.card, PCSC_LEAVE_CARD);
+  if (err)
+    {
+      log_error ("pcsc_disconnect failed: %s (0x%lx)\n",
+                 pcsc_error_string (err), err);
+      return SW_HOST_CARD_IO_ERROR;
+    }
+  reader_table[slot].pcsc.card = 0;
   return 0;
+}
 #endif /*!NEED_PCSC_WRAPPER*/
+
+
+#ifndef NEED_PCSC_WRAPPER
+static int
+reset_pcsc_reader_direct (int slot)
+{
+  int sw;
+
+  sw = disconnect_pcsc_card (slot);
+  if (!sw)
+    sw = connect_pcsc_card (slot);
+
+  return sw;
 }
+#endif /*NEED_PCSC_WRAPPER*/
+
 
-/* Note:  It is a pitty that we can't return proper error codes.  */
+#ifdef NEED_PCSC_WRAPPER
 static int
-open_pcsc_reader (const char *portstr)
+reset_pcsc_reader_wrapped (int slot)
+{
+  long err;
+  reader_table_t slotp;
+  size_t len;
+  int i, n;
+  unsigned char msgbuf[9];
+  unsigned int dummy_status;
+  int sw = SW_HOST_CARD_IO_ERROR;
+
+  slotp = reader_table + slot;
+
+  if (slotp->pcsc.req_fd == -1
+      || slotp->pcsc.rsp_fd == -1
+      || slotp->pcsc.pid == (pid_t)(-1) )
+    {
+      log_error ("pcsc_get_status: pcsc-wrapper not running\n");
+      return sw;
+    }
+
+  msgbuf[0] = 0x05; /* RESET command. */
+  len = 0;
+  msgbuf[1] = (len >> 24);
+  msgbuf[2] = (len >> 16);
+  msgbuf[3] = (len >>  8);
+  msgbuf[4] = (len      );
+  if ( writen (slotp->pcsc.req_fd, msgbuf, 5) )
+    {
+      log_error ("error sending PC/SC RESET request: %s\n",
+                 strerror (errno));
+      goto command_failed;
+    }
+
+  /* Read the response. */
+  if ((i=readn (slotp->pcsc.rsp_fd, msgbuf, 9, &len)) || len != 9)
+    {
+      log_error ("error receiving PC/SC RESET response: %s\n",
+                 i? strerror (errno) : "premature EOF");
+      goto command_failed;
+    }
+  len = (msgbuf[1] << 24) | (msgbuf[2] << 16) | (msgbuf[3] << 8 ) | msgbuf[4];
+  if (msgbuf[0] != 0x81 || len < 4)
+    {
+      log_error ("invalid response header from PC/SC received\n");
+      goto command_failed;
+    }
+  len -= 4; /* Already read the error code. */
+  if (len > DIM (slotp->atr))
+    {
+      log_error ("PC/SC returned a too large ATR (len=%lx)\n",
+                 (unsigned long)len);
+      sw = SW_HOST_GENERAL_ERROR;
+      goto command_failed;
+    }
+  err = PCSC_ERR_MASK ((msgbuf[5] << 24) | (msgbuf[6] << 16)
+                       | (msgbuf[7] << 8 ) | msgbuf[8]);
+  if (err)
+    {
+      log_error ("PC/SC RESET failed: %s (0x%lx)\n",
+                 pcsc_error_string (err), err);
+      /* If the error code is no smart card, we should not considere
+         this a major error and close the wrapper.  */
+      sw = pcsc_error_to_sw (err);
+      if (err == PCSC_E_NO_SMARTCARD)
+        return sw;
+      goto command_failed;
+    }
+
+  /* The open function may return a zero for the ATR length to
+     indicate that no card is present.  */
+  n = len;
+  if (n)
+    {
+      if ((i=readn (slotp->pcsc.rsp_fd, slotp->atr, n, &len)) || len != n)
+        {
+          log_error ("error receiving PC/SC RESET response: %s\n",
+                     i? strerror (errno) : "premature EOF");
+          goto command_failed;
+        }
+    }
+  slotp->atrlen = len;
+
+  /* Read the status so that IS_T0 will be set. */
+  pcsc_get_status (slot, &dummy_status);
+
+  return 0;
+
+ command_failed:
+  close (slotp->pcsc.req_fd);
+  close (slotp->pcsc.rsp_fd);
+  slotp->pcsc.req_fd = -1;
+  slotp->pcsc.rsp_fd = -1;
+  kill (slotp->pcsc.pid, SIGTERM);
+  slotp->pcsc.pid = (pid_t)(-1);
+  slotp->used = 0;
+  return sw;
+}
+#endif /* !NEED_PCSC_WRAPPER */
+
+
+/* Send an PC/SC reset command and return a status word on error or 0
+   on success. */
+static int
+reset_pcsc_reader (int slot)
 {
 #ifdef NEED_PCSC_WRAPPER
+  return reset_pcsc_reader_wrapped (slot);
+#else
+  return reset_pcsc_reader_direct (slot);
+#endif
+}
+
+
+/* Open the PC/SC reader without using the wrapper.  Returns -1 on
+   error or a slot number for the reader.  */
+#ifndef NEED_PCSC_WRAPPER
+static int
+open_pcsc_reader_direct (const char *portstr)
+{
+  long err;
+  int slot;
+  char *list = NULL;
+  unsigned long nreader, listlen;
+  char *p;
+
+  slot = new_reader_slot ();
+  if (slot == -1)
+    return -1;
+
+  /* Fixme: Allocating a context for each slot is not required.  One
+     global context should be sufficient.  */
+  err = pcsc_establish_context (PCSC_SCOPE_SYSTEM, NULL, NULL,
+                                &reader_table[slot].pcsc.context);
+  if (err)
+    {
+      log_error ("pcsc_establish_context failed: %s (0x%lx)\n",
+                 pcsc_error_string (err), err);
+      reader_table[slot].used = 0;
+      return -1;
+    }
+
+  err = pcsc_list_readers (reader_table[slot].pcsc.context,
+                           NULL, NULL, &nreader);
+  if (!err)
+    {
+      list = xtrymalloc (nreader+1); /* Better add 1 for safety reasons. */
+      if (!list)
+        {
+          log_error ("error allocating memory for reader list\n");
+          pcsc_release_context (reader_table[slot].pcsc.context);
+          reader_table[slot].used = 0;
+          return -1 /*SW_HOST_OUT_OF_CORE*/;
+        }
+      err = pcsc_list_readers (reader_table[slot].pcsc.context,
+                               NULL, list, &nreader);
+    }
+  if (err)
+    {
+      log_error ("pcsc_list_readers failed: %s (0x%lx)\n",
+                 pcsc_error_string (err), err);
+      pcsc_release_context (reader_table[slot].pcsc.context);
+      reader_table[slot].used = 0;
+      xfree (list);
+      return -1;
+    }
+
+  listlen = nreader;
+  p = list;
+  while (nreader)
+    {
+      if (!*p && !p[1])
+        break;
+      if (*p)
+        log_info ("detected reader `%s'\n", p);
+      if (nreader < (strlen (p)+1))
+        {
+          log_error ("invalid response from pcsc_list_readers\n");
+          break;
+        }
+      nreader -= strlen (p)+1;
+      p += strlen (p) + 1;
+    }
+
+  reader_table[slot].rdrname = xtrymalloc (strlen (portstr? portstr : list)+1);
+  if (!reader_table[slot].rdrname)
+    {
+      log_error ("error allocating memory for reader name\n");
+      pcsc_release_context (reader_table[slot].pcsc.context);
+      reader_table[slot].used = 0;
+      return -1;
+    }
+  strcpy (reader_table[slot].rdrname, portstr? portstr : list);
+  xfree (list);
+  list = NULL;
+
+  reader_table[slot].pcsc.card = 0;
+  reader_table[slot].atrlen = 0;
+  reader_table[slot].last_status = 0;
+
+  reader_table[slot].connect_card = connect_pcsc_card;
+  reader_table[slot].disconnect_card = disconnect_pcsc_card;
+  reader_table[slot].close_reader = close_pcsc_reader;
+  reader_table[slot].reset_reader = reset_pcsc_reader;
+  reader_table[slot].get_status_reader = pcsc_get_status;
+  reader_table[slot].send_apdu_reader = pcsc_send_apdu;
+  reader_table[slot].dump_status_reader = dump_pcsc_reader_status;
+
+  dump_reader_status (slot);
+  return slot;
+}
+#endif /*!NEED_PCSC_WRAPPER */
+
+
 /* Open the PC/SC reader using the pcsc_wrapper program.  This is
    needed to cope with different thread models and other peculiarities
    of libpcsclite. */
+#ifdef NEED_PCSC_WRAPPER
+static int
+open_pcsc_reader_wrapped (const char *portstr)
+{
   int slot;
   reader_table_t slotp;
   int fd, rp[2], wp[2];
@@ -1358,8 +1585,8 @@ open_pcsc_reader (const char *portstr)
     return -1;
   slotp = reader_table + slot;
 
-  /* Fire up the pcsc wrapper.  We don't use any fork/exec code from
-     the common directy but implement it direclty so that this file
+  /* Fire up the PC/SCc wrapper.  We don't use any fork/exec code from
+     the common directy but implement it directly so that this file
      may still be source copied. */
 
   if (pipe (rp) == -1)
@@ -1449,7 +1676,7 @@ open_pcsc_reader (const char *portstr)
 #endif
   while ( (i=WAIT (pid, NULL, 0)) == -1 && errno == EINTR)
     ;
-#undef X
+#undef WAIT
 
   /* Now send the open request. */
   msgbuf[0] = 0x01; /* OPEN command. */
@@ -1509,7 +1736,10 @@ open_pcsc_reader (const char *portstr)
         }
       /* If we got to here we know that a card is present
          and usable.  Thus remember this.  */
-      slotp->last_status = (1|2|4| 0x8000);
+      slotp->last_status = (  APDU_CARD_USABLE
+                            | APDU_CARD_PRESENT
+                            | APDU_CARD_ACTIVE
+                            | 0x8000);
     }
   slotp->atrlen = len;
 
@@ -1517,7 +1747,6 @@ open_pcsc_reader (const char *portstr)
   reader_table[slot].reset_reader = reset_pcsc_reader;
   reader_table[slot].get_status_reader = pcsc_get_status;
   reader_table[slot].send_apdu_reader = pcsc_send_apdu;
-  reader_table[slot].check_keypad = NULL;
   reader_table[slot].dump_status_reader = dump_pcsc_reader_status;
 
   /* Read the status so that IS_T0 will be set. */
@@ -1537,146 +1766,21 @@ open_pcsc_reader (const char *portstr)
   /* There is no way to return SW. */
   return -1;
 
-#else /*!NEED_PCSC_WRAPPER */
-  long err;
-  int slot;
-  char *list = NULL;
-  unsigned long nreader, listlen, atrlen;
-  char *p;
-  unsigned long card_state, card_protocol;
-
-  slot = new_reader_slot ();
-  if (slot == -1)
-    return -1;
-
-  err = pcsc_establish_context (PCSC_SCOPE_SYSTEM, NULL, NULL,
-                                &reader_table[slot].pcsc.context);
-  if (err)
-    {
-      log_error ("pcsc_establish_context failed: %s (0x%lx)\n",
-                 pcsc_error_string (err), err);
-      reader_table[slot].used = 0;
-      return -1;
-    }
-
-  err = pcsc_list_readers (reader_table[slot].pcsc.context,
-                           NULL, NULL, &nreader);
-  if (!err)
-    {
-      list = xtrymalloc (nreader+1); /* Better add 1 for safety reasons. */
-      if (!list)
-        {
-          log_error ("error allocating memory for reader list\n");
-          pcsc_release_context (reader_table[slot].pcsc.context);
-          reader_table[slot].used = 0;
-          return -1 /*SW_HOST_OUT_OF_CORE*/;
-        }
-      err = pcsc_list_readers (reader_table[slot].pcsc.context,
-                               NULL, list, &nreader);
-    }
-  if (err)
-    {
-      log_error ("pcsc_list_readers failed: %s (0x%lx)\n",
-                 pcsc_error_string (err), err);
-      pcsc_release_context (reader_table[slot].pcsc.context);
-      reader_table[slot].used = 0;
-      xfree (list);
-      return -1 /*pcsc_error_to_sw (err)*/;
-    }
-
-  listlen = nreader;
-  p = list;
-  while (nreader)
-    {
-      if (!*p && !p[1])
-        break;
-      if (*p)
-        log_info ("detected reader `%s'\n", p);
-      if (nreader < (strlen (p)+1))
-        {
-          log_error ("invalid response from pcsc_list_readers\n");
-          break;
-        }
-      nreader -= strlen (p)+1;
-      p += strlen (p) + 1;
-    }
-
-  reader_table[slot].rdrname = xtrymalloc (strlen (portstr? portstr : list)+1);
-  if (!reader_table[slot].rdrname)
-    {
-      log_error ("error allocating memory for reader name\n");
-      pcsc_release_context (reader_table[slot].pcsc.context);
-      reader_table[slot].used = 0;
-      return -1 /*SW_HOST_OUT_OF_CORE*/;
-    }
-  strcpy (reader_table[slot].rdrname, portstr? portstr : list);
-  xfree (list);
-  list = NULL;
-
-  err = pcsc_connect (reader_table[slot].pcsc.context,
-                      reader_table[slot].rdrname,
-                      PCSC_SHARE_EXCLUSIVE,
-                      PCSC_PROTOCOL_T0|PCSC_PROTOCOL_T1,
-                      &reader_table[slot].pcsc.card,
-                      &reader_table[slot].pcsc.protocol);
-  if (err == PCSC_E_NO_SMARTCARD) 
-    reader_table[slot].pcsc.card = 0;
-  else if (err)
-    {
-      log_error ("pcsc_connect failed: %s (0x%lx)\n",
-                  pcsc_error_string (err), err);
-      pcsc_release_context (reader_table[slot].pcsc.context);
-      xfree (reader_table[slot].rdrname);
-      reader_table[slot].rdrname = NULL;
-      reader_table[slot].used = 0;
-      return -1 /*pcsc_error_to_sw (err)*/;
-    }
-
-  reader_table[slot].atrlen = 0;
-  reader_table[slot].last_status = 0;
-  if (!err)
-    {
-      char reader[250];
-      unsigned long readerlen;
-
-      atrlen = DIM (reader_table[0].atr);
-      readerlen = sizeof reader -1 ;
-      err = pcsc_status (reader_table[slot].pcsc.card,
-                         reader, &readerlen,
-                         &card_state, &card_protocol,
-                         reader_table[slot].atr, &atrlen);
-      if (err)
-        log_error ("pcsc_status failed: %s (0x%lx) %lu\n",
-                   pcsc_error_string (err), err, readerlen);
-      else
-        {
-          if (atrlen > DIM (reader_table[0].atr))
-            log_bug ("ATR returned by pcsc_status is too large\n");
-          reader_table[slot].atrlen = atrlen;
-          /* If we got to here we know that a card is present
-             and usable.  Thus remember this.  */
-          reader_table[slot].last_status = (1|2|4| 0x8000);
-          reader_table[slot].is_t0 = !!(card_protocol & PCSC_PROTOCOL_T0);
-        }
-    }
-
-  reader_table[slot].close_reader = close_pcsc_reader;
-  reader_table[slot].reset_reader = reset_pcsc_reader;
-  reader_table[slot].get_status_reader = pcsc_get_status;
-  reader_table[slot].send_apdu_reader = pcsc_send_apdu;
-  reader_table[slot].check_keypad = NULL;
-  reader_table[slot].dump_status_reader = dump_pcsc_reader_status;
+}
+#endif /*NEED_PCSC_WRAPPER*/
 
-/*   log_debug ("state    from pcsc_status: 0x%lx\n", card_state); */
-/*   log_debug ("protocol from pcsc_status: 0x%lx\n", card_protocol); */
 
-  dump_reader_status (slot);
-  return slot;
-#endif /*!NEED_PCSC_WRAPPER */
+static int
+open_pcsc_reader (const char *portstr)
+{
+#ifdef NEED_PCSC_WRAPPER
+  return open_pcsc_reader_wrapped (portstr);
+#else
+  return open_pcsc_reader_direct (portstr);
+#endif
 }
 
 
-
 
 #ifdef HAVE_LIBUSB
 /*
@@ -1738,9 +1842,9 @@ get_status_ccid (int slot, unsigned int *status)
     return -1;
 
   if (bits == 0)
-    *status = 1|2|4;
+    *status = (APDU_CARD_USABLE|APDU_CARD_PRESENT|APDU_CARD_ACTIVE);
   else if (bits == 1)
-    *status = 2;
+    *status = APDU_CARD_PRESENT;
   else
     *status = 0;
 
@@ -1836,7 +1940,10 @@ open_ccid_reader (const char *portstr)
     {
       /* If we got to here we know that a card is present
          and usable.  Thus remember this.  */
-      reader_table[slot].last_status = (1|2|4| 0x8000);
+      reader_table[slot].last_status = (APDU_CARD_USABLE
+                                        | APDU_CARD_PRESENT
+                                        | APDU_CARD_ACTIVE 
+                                        | 0x8000);
     }
 
   reader_table[slot].close_reader = close_ccid_reader;
@@ -2335,7 +2442,11 @@ apdu_open_reader (const char *portstr)
       pcsc_api_loaded = 1;
     }
 
+#ifdef NEED_PCSC_WRAPPER
+  return open_pcsc_reader_wrapped (portstr);
+#else
   return open_pcsc_reader (portstr);
+#endif
 }
 
 
@@ -2378,21 +2489,31 @@ apdu_open_remote_reader (const char *portstr,
 int
 apdu_close_reader (int slot)
 {
+  int sw;
+
   if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
     return SW_HOST_NO_DRIVER;
+  sw = apdu_disconnect (slot);
+  if (sw)
+    return sw;
   if (reader_table[slot].close_reader)
     return reader_table[slot].close_reader (slot);
   return SW_HOST_NOT_SUPPORTED;
 }
 
 /* Shutdown a reader; that is basically the same as a close but keeps
-   the handle ready for later use. A apdu_reset_reader should be used
-   to get it active again. */
+   the handle ready for later use. A apdu_reset_reader or apdu_connect
+   should be used to get it active again. */
 int
 apdu_shutdown_reader (int slot)
 {
+  int sw;
+
   if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
     return SW_HOST_NO_DRIVER;
+  sw = apdu_disconnect (slot);
+  if (sw)
+    return sw;
   if (reader_table[slot].shutdown_reader)
     return reader_table[slot].shutdown_reader (slot);
   return SW_HOST_NOT_SUPPORTED;
@@ -2410,6 +2531,58 @@ apdu_enum_reader (int slot, int *used)
   return 0;
 }
 
+
+/* Connect a card.  This is used to power up the card and make sure
+   that an ATR is available.  */
+int
+apdu_connect (int slot)
+{
+  int sw;
+
+  if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
+    return SW_HOST_NO_DRIVER;
+
+  /* Only if the access method provides a connect function we use it.
+     If not, we expect that the card has been implicitly connected by
+     apdu_open_reader.  */
+  if (reader_table[slot].connect_card)
+    {
+      sw = lock_slot (slot);
+      if (!sw)
+        {
+          sw = reader_table[slot].connect_card (slot);
+          unlock_slot (slot);
+        }
+    }
+  else
+    sw = 0;
+  return sw;
+}
+
+int
+apdu_disconnect (int slot)
+{
+  int sw;
+
+  if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
+    return SW_HOST_NO_DRIVER;
+
+  if (reader_table[slot].disconnect_card)
+    {
+      sw = lock_slot (slot);
+      if (!sw)
+        {
+          sw = reader_table[slot].disconnect_card (slot);
+          unlock_slot (slot);
+        }
+    }
+  else
+    sw = 0;
+  return sw;
+}
+
+
+
 /* Do a reset for the card in reader at SLOT. */
 int
 apdu_reset (int slot)
@@ -2430,7 +2603,10 @@ apdu_reset (int slot)
     {
       /* If we got to here we know that a card is present
          and usable.  Thus remember this.  */
-      reader_table[slot].last_status = (1|2|4| 0x8000);
+      reader_table[slot].last_status = (APDU_CARD_USABLE
+                                        | APDU_CARD_PRESENT
+                                        | APDU_CARD_ACTIVE 
+                                        | 0x8000);
     }
 
   unlock_slot (slot);
@@ -2474,7 +2650,10 @@ apdu_activate (int slot)
                 {
                   /* If we got to here we know that a card is present
                      and usable.  Thus remember this.  */
-                  reader_table[slot].last_status = (1|2|4| 0x8000);
+                  reader_table[slot].last_status = (APDU_CARD_USABLE
+                                                    | APDU_CARD_PRESENT
+                                                    | APDU_CARD_ACTIVE
+                                                    | 0x8000);
                 }
             }
         }
@@ -2493,7 +2672,8 @@ apdu_get_atr (int slot, size_t *atrlen)
 
   if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
     return NULL;
-
+  if (!reader_table[slot].atrlen)
+    return NULL;
   buf = xtrymalloc (reader_table[slot].atrlen);
   if (!buf)
     return NULL;
@@ -2508,12 +2688,12 @@ apdu_get_atr (int slot, size_t *atrlen)
    card to become available if HANG is set to true. On success the
    bits in STATUS will be set to
 
-     bit 0 = card present and usable
-     bit 1 = card present
-     bit 2 = card active
-     bit 3 = card access locked [not yet implemented]
+     APDU_CARD_USABLE  (bit 0) = card present and usable
+     APDU_CARD_PRESENT (bit 1) = card present
+     APDU_CARD_ACTIVE  (bit 2) = card active
+                       (bit 3) = card access locked [not yet implemented]
 
-   For must application, testing bit 0 is sufficient.
+   For must applications, testing bit 0 is sufficient.
 
    CHANGED will receive the value of the counter tracking the number
    of card insertions.  This value may be used to detect a card
diff --git a/scd/apdu.h b/scd/apdu.h
index 361dfdead..007bda767 100644
--- a/scd/apdu.h
+++ b/scd/apdu.h
@@ -65,13 +65,20 @@ enum {
   SW_HOST_GENERAL_ERROR = 0x1000b,
   SW_HOST_NO_READER     = 0x1000c,
   SW_HOST_ABORTED       = 0x1000d,
-  SW_HOST_NO_KEYPAD     = 0x1000e
+  SW_HOST_NO_KEYPAD     = 0x1000e,
+  SW_HOST_ALREADY_CONNECTED = 0x1000f
 };
 
 
 #define SW_EXACT_LENGTH_P(a) (((a)&~0xff) == SW_EXACT_LENGTH)
 
 
+/* Bit flags for the card status.  */
+#define APDU_CARD_USABLE   (1)    /* Card is present and ready for use.  */
+#define APDU_CARD_PRESENT  (2)    /* Card is just present.  */
+#define APDU_CARD_ACTIVE   (4)    /* Card is active.  */
+
+
 /* Note , that apdu_open_reader returns no status word but -1 on error. */
 int apdu_open_reader (const char *portstr);
 int apdu_open_remote_reader (const char *portstr,
@@ -92,7 +99,10 @@ unsigned char *apdu_get_atr (int slot, size_t *atrlen);
 const char *apdu_strerror (int rc);
 
 
-/* These apdu functions do return status words. */
+/* These APDU functions return status words. */
+
+int apdu_connect (int slot);
+int apdu_disconnect (int slot);
 
 int apdu_activate (int slot);
 int apdu_reset (int slot);
diff --git a/scd/command.c b/scd/command.c
index 696fa67ee..aabd93c25 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -102,8 +102,12 @@ struct server_local_s
   /* The Assuan context used by this session/server. */
   assuan_context_t assuan_ctx;
 
-  int event_signal;        /* Or 0 if not used. */
-
+#ifdef HAVE_W32_SYSTEM
+  unsigned long event_signal;   /* Or 0 if not used. */
+#else
+  int event_signal;             /* Or 0 if not used. */
+#endif
+  
   /* True if the card has been removed and a reset is required to
      continue operation. */
   int card_removed;        
@@ -165,6 +169,7 @@ update_card_removed (int slot, int value)
       {
         sl->card_removed = value;
       }
+  /* Let the card application layer know about the removal.  */
   if (value)
     application_notify_card_removed (slot);
 }
@@ -319,10 +324,16 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
   if (!strcmp (key, "event-signal"))
     {
       /* A value of 0 is allowed to reset the event signal. */
+#ifdef HAVE_W32_SYSTEM
+      if (!*value)
+        return gpg_error (GPG_ERR_ASS_PARAMETER);
+      ctrl->server_local->event_signal = strtoul (value, NULL, 16);
+#else
       int i = *value? atoi (value) : -1;
       if (i < 0)
         return gpg_error (GPG_ERR_ASS_PARAMETER);
       ctrl->server_local->event_signal = i;
+#endif
     }
 
  return 0;
@@ -389,7 +400,15 @@ open_card (ctrl_t ctrl, const char *apptype)
   if (slot == -1)
     err = gpg_error (GPG_ERR_CARD);
   else
-    err = select_application (ctrl, slot, apptype, &ctrl->app_ctx);
+    {
+      /* Fixme: We should move the apdu_connect call to
+         select_application.  */
+      int sw = apdu_connect (slot);
+      if (sw && sw != SW_HOST_ALREADY_CONNECTED)
+        err = gpg_error (GPG_ERR_CARD);
+      else
+        err = select_application (ctrl, slot, apptype, &ctrl->app_ctx);
+    }
 
   TEST_CARD_REMOVAL (ctrl, err);
   return err;
@@ -1774,7 +1793,7 @@ scd_command_handler (ctrl_t ctrl, int fd)
     }
   else
     {
-      rc = assuan_init_socket_server_ext (&ctx, fd, 2);
+      rc = assuan_init_socket_server_ext (&ctx, INT2FD(fd), 2);
     }
   if (rc)
     {
@@ -1911,6 +1930,11 @@ update_reader_status_file (void)
   int idx;
   unsigned int status, changed;
 
+  /* Make sure that the reader has been opened.  Like get_reader_slot,
+     this part of the code assumes that there is only one reader.  */
+  if (!slot_table[0].valid)
+    (void)get_reader_slot ();
+
   /* Note, that we only try to get the status, because it does not
      make sense to wait here for a operation to complete.  If we are
      busy working with a card, delays in the status file update should
@@ -2007,11 +2031,20 @@ update_reader_status_file (void)
             if (sl->event_signal && sl->assuan_ctx)
               {
                 pid_t pid = assuan_get_pid (sl->assuan_ctx);
+
+#ifdef HAVE_W32_SYSTEM
+                HANDLE handle = (void *)sl->event_signal;
+                
+                log_info ("client pid is %d, triggering event %lx (%p)\n",
+                          pid, sl->event_signal, handle);
+                if (!SetEvent (handle))
+                  log_error ("SetEvent(%lx) failed: %s\n",
+                             sl->event_signal, w32_strerror (-1));
+#else
                 int signo = sl->event_signal;
                 
                 log_info ("client pid is %d, sending signal %d\n",
                           pid, signo);
-#ifndef HAVE_W32_SYSTEM
                 if (pid != (pid_t)(-1) && pid && signo > 0)
                   kill (pid, signo);
 #endif
diff --git a/scd/sc-copykeys.c b/scd/sc-copykeys.c
index 6a6c0e0d3..275bcf877 100644
--- a/scd/sc-copykeys.c
+++ b/scd/sc-copykeys.c
@@ -142,6 +142,8 @@ main (int argc, char **argv )
   slot = apdu_open_reader (reader_port);
   if (slot == -1)
     exit (1);
+  if (apdu_connect (slot))
+    exit (1);
 
   /* FIXME: Use select_application. */
   appbuf.slot = slot;
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 68119f592..384df51bf 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -148,15 +148,18 @@ static ARGPARSE_OPTS opts[] = {
 #define DEFAULT_PCSC_DRIVER "libpcsclite.so"
 #endif
 
-/* The timer tick used for housekeeping stuff.  For Windows we use a
-   longer period as the SetWaitableTimer seems to signal earlier than
-   the 2 seconds.  */
-#ifdef HAVE_W32_SYSTEM
-#define TIMERTICK_INTERVAL    (4)
-#else
-#define TIMERTICK_INTERVAL    (2)    /* Seconds.  */
-#endif
-
+/* The timer tick used for housekeeping stuff.  We poll every 250ms to
+   let the user immediately know a status change.
+
+   This is not too good for power saving but given that there is no
+   easy way to block on card status changes it is the best we can do.
+   For PC/SC we could in theory use an extra thread to wait for status
+   changes but that requires a native thread because there is no way
+   to make the underlying PC/SC card change function block using a Pth
+   mechanism.  Given that a native thread could only be used under W32
+   we don't do that at all.  */
+#define TIMERTICK_INTERVAL_SEC     (0)
+#define TIMERTICK_INTERVAL_USEC    (250000)
 
 /* Flag to indicate that a shutdown was requested. */
 static int shutdown_pending;
@@ -1107,7 +1110,8 @@ handle_connections (int listen_fd)
       /* Create a timeout event if needed. */
       if (!time_ev)
         time_ev = pth_event (PTH_EVENT_TIME,
-                             pth_timeout (TIMERTICK_INTERVAL, 0));
+                             pth_timeout (TIMERTICK_INTERVAL_SEC,
+                                          TIMERTICK_INTERVAL_USEC));
 
       /* POSIX says that fd_set should be implemented as a structure,
          thus a simple assignment is fine to copy the entire set.  */