Preparing for 2.0.12.gnupg-2.0.12

author: Werner Koch <[email protected]> 2009-06-17 11:18:26 +0000
committer: Werner Koch <[email protected]> 2009-06-17 11:18:26 +0000
commit: c998dd12a2dd0bd219ce0a68bdd9fcf82bb1c70e (patch)
tree: 11be2c0a6cb5cd0fee8ff31436d72f56074fda40
parent: Use cancel button in confirmation only if requested. (diff)
download: gnupg-c998dd12a2dd0bd219ce0a68bdd9fcf82bb1c70e.tar.gz
gnupg-c998dd12a2dd0bd219ce0a68bdd9fcf82bb1c70e.zip
32 files changed, 4281 insertions, 4141 deletions
diff --git a/NEWS b/NEWS
index 24596058b..3f3195e3f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,6 @@
-Noteworthy changes in version 2.0.12 (not released)
+Noteworthy changes in version 2.0.12 (2009-06-17)
 -------------------------------------------------
 
- This is a BETA version!
-
  * GPGSM now always lists ephemeral certificates if specified by
    fingerprint or keygrip.
 
@@ -10,10 +8,10 @@ Noteworthy changes in version 2.0.12 (not released)
    information about smartcards.
 
  * Made sure not to leak file descriptors if running gpg-agent with a
-   command.  Restores the signal mask to solve a problem in Mono.
+   command.  Restore the signal mask to solve a problem in Mono.
 
  * Changed order of the confirmation questions for root certificates
-   and stores negative answers in trustlist.txt.
+   and store negative answers in trustlist.txt.
 
  * Better synchronization of concurrent smartcard sessions.
 
diff --git a/configure.ac b/configure.ac
index 6e81812fa..94092af50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ min_automake_version="1.10"
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 m4_define([my_version], [2.0.12])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
diff --git a/doc/help.txt b/doc/help.txt
index c4cc3d11a..e186e27e8 100644
--- a/doc/help.txt
+++ b/doc/help.txt
@@ -168,6 +168,7 @@ Answer "yes" or "no".
 
 .gpg.keygen.name
 Enter the name of the key holder. 
+The characters "<" and ">" are not allowed.
 Example: Heinrich Heine
 .
 
@@ -179,6 +180,7 @@ Example: [email protected]
 
 .gpg.keygen.comment
 Please enter an optional comment.
+The characters "(" and ")" are not allowed.
 In general there is no need for a comment.
 .
 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index be083a6cd..e961921a1 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-17  Werner Koch  <[email protected]>
 
+	* parse-packet.c (parse): Use a casted -1 instead of a 32 bit
+	constant to check for a garbled package.  Fixes bug#1040.
+
 	* card-util.c (put_data_to_file, read_cert): New. 
 	(card_edit): Add command "readcert".
 	(fetch_url): Allow code also for this gnupg major version 2.
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 324ab5e2e..a86e54981 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -501,8 +501,8 @@ parse( IOBUF inp, PACKET *pkt, int onlykeypkts, off_t *retpos,
 	  }
       }
 
-    if (pktlen == 0xffffffff) {
-        /* with a some probability this is caused by a problem in the
+    if (pktlen == (unsigned long)(-1)) {
+        /* With some probability this is caused by a problem in the
          * the uncompressing layer - in some error cases it just loops
          * and spits out 0xff bytes. */
         log_error ("%s: garbled packet detected\n", iobuf_where(inp) );
diff --git a/po/be.po b/po/be.po
index e3bc9c8e3..718d9ff3c 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -91,15 +91,15 @@ msgstr "дрэнны пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1169,183 +1169,188 @@ msgstr ""
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:83
+#: g10/card-util.c:106
 msgid "This command is only available for version 2 cards\n"
 msgstr ""
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 msgid "Reset Code not or not anymore available\n"
 msgstr ""
 
-#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr ""
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "непадтрымліваецца"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/card-util.c:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1353,137 +1358,137 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "Даведка адсутнічае"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Загад> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
@@ -1496,13 +1501,13 @@ msgstr ""
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4671,139 +4676,139 @@ msgstr ""
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, c-format
 msgid "searching for names from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "агульная памылка"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
@@ -6410,19 +6415,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6471,195 +6476,195 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: scd/app-openpgp.c:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "Паўтарыце пароль\n"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "Паўтарыце пароль\n"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "Паўтарыце пароль\n"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index f36358364..7f0884d35 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -113,15 +113,15 @@ msgstr "la contrasenya és errònia"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1239,54 +1239,54 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la clau secreta no està disponible"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[no establert]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "home"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "dóna"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "no especificat"
 
@@ -1294,139 +1294,144 @@ 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:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "no forçat"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 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:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, 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:944
+#: g10/card-util.c:1019
 #, 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:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, 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:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1434,139 +1439,139 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, 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:1370
+#: g10/card-util.c:1452
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau és disponible en: "
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
@@ -1579,13 +1584,13 @@ msgstr "--output no funciona per a aquesta ordre\n"
 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:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -5021,142 +5026,142 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error de servidor de claus"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
@@ -6898,19 +6903,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6959,196 +6964,196 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, 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:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, 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:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, 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:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 #, 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:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, 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:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 6570bbb37..20bf8757f 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -94,15 +94,15 @@ msgstr "�patn� heslo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1193,178 +1193,183 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGp karta nen� dostupn�: %s\n"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[nen� nastaven]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "mu�"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "�ena"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "neuvedeno"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "nen� vy�adov�no"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "vy�adov�no"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 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:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak \"<\" nelze pou��t.\n"
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: V�ce mezer nen� povoleno.\n"
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "P��jmen� dr�itele karty: "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Jm�no (k�estn�) dr�itele karty: "
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, 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:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, 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:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Login (jm�nu ��tu): "
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, 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:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Priv�tn� DO data: "
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, 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:927
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Jazykov� p�edvolby: "
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatn� d�lka �etezce s p�edvolbami.\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatn� znak v �et�zci s p�edvolbami\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 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:979
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s kl��em nen� mo�n�: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "toto nen� OpenPGP karta"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, 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:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr "P�epsat existuj�c� kl��? (a/N) "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 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:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr "P�epsat existuj�c� kl��e? (a/N) "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1375,124 +1380,124 @@ msgstr ""
 "   PIN = `%s'     PIN administr�tora = `%s'\n"
 "Toto nastaven� m��ete zm�nit p��kazem --change-pin\n"
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovac� kl��\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �ifrovac� kl��\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 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:1360
+#: g10/card-util.c:1442
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�m� algoritmus pro ochranu kl��e\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 msgid "secret parts of key are not available\n"
 msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 msgid "list all available data"
 msgstr "vypi� v�echna dostupn� data"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr "zm�n� jm�no majitele karty"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr "zm�n� URL pro z�sk�n� kl��e"
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr "z�sk� kl�� specifikovan� v URL karty"
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr "zm�nit login name"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 msgid "change the language preferences"
 msgstr "zm�nit jazykov� p�edvolby"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr "zm�n� pohlav� dr�itele karty"
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 msgid "change a CA fingerprint"
 msgstr "vypsat fingerprint certifika�n� autority"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 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:1455
+#: g10/card-util.c:1537
 msgid "generate new keys"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr "ov�� PIN a vypi� v�echna data"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 msgid "Admin-only command\n"
 msgstr "pouze administr�torsk� p��kazy\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr "administr�torsk� p��kazy jsou povoleny\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
@@ -1505,13 +1510,13 @@ msgstr "--output pro tento p��kaz nen� platn�\n"
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4796,135 +4801,135 @@ msgstr "disabled"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Vlo�te ��slo (��sla), 'N' pro dal�� nebo 'Q' pro konec> "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� protokol serveru kl��� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kl�� \"%s\" nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 msgid "key not found on keyserver\n"
 msgstr "kl�� nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�aduji kl�� %s ze %s server %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�aduji kl�� %s z %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "pos�l�m kl�� %s na %s server %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "pos�l�m kl�� %s na %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 msgid "no keyserver action!\n"
 msgstr "��dn� operace se serverem kl���!\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr "server kl��� neposlal VERSION\n"
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "vol�n� extern�ho keyserver nen� v t�to verzi podporov�no\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "protokol serveru kl��� `%s' nen� podporov�n\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "akce `%s' nen� podporov�na v protokolu `%s' serveru kl���\n"
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nepodporuje protokol verze  %d\n"
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 msgid "keyserver timed out\n"
 msgstr "�asov� limit pro server kl��� vypr�el\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 msgid "keyserver internal error\n"
 msgstr "intern� chyba serveru kl���\n"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "chyba komunikace se serverem kl���: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nen� ID kl��e: p�esko�eno\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "aktualizuji 1 kl�� z %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "aktualizuji %d kl��� z %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
@@ -6588,19 +6593,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, 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-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, 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-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
@@ -6649,78 +6654,78 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, 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:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, 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:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpov�� neobsahuje RSA modulus\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, 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:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, 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:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifikace CHV%d se nezda�ila: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6728,115 +6733,115 @@ msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 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:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, 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:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nov� PIN administr�tora"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr "|N|Nov� PIN"
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr "chyba p�i �ten� aplika�n�ch dat\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 msgid "error reading fingerprint DO\n"
 msgstr "chyba p�i �ten� fingerpritnu DO\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 msgid "key already exists\n"
 msgstr "kl�� ji� existuje\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr "existuj�c� kl�� bude p�eps�n\n"
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 msgid "generating new key\n"
 msgstr "generov�n� nov�ho kl��e\n"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr "chyb� �asov� raz�tko vytvo�en�\n"
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, 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:2618
+#: scd/app-openpgp.c:2644
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr "pros�m po�kejte ne� bude kl�� vygenerov�n ...\n"
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 msgid "generating key failed\n"
 msgstr "henerov�n� kl��e se nezda�ilo\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generov�n� kl��e dokon�eno (%d sekund)\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatn� struktura OpenPGP kraty (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvo�en� podpisy: %lu\n"
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 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:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
diff --git a/po/da.po b/po/da.po
index 46d93e49c..75518f22e 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -92,15 +92,15 @@ msgstr "d�rlig kodes�tning"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1181,190 +1181,195 @@ msgstr "ingen gyldig OpenPGP data fundet.\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:83
+#: g10/card-util.c:106
 msgid "This command is only available for version 2 cards\n"
 msgstr ""
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "sl�til"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "sl�til"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "ikke bearbejdet"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 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:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingeraftryk:"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, 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:1165
+#: g10/card-util.c:1247
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1372,140 +1377,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr ""
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
@@ -1518,13 +1523,13 @@ msgstr ""
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -4790,139 +4795,139 @@ msgstr "sl�fra"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
@@ -6565,19 +6570,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6626,198 +6631,198 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, 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:669
+#: scd/app-openpgp.c:691
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: scd/app-openpgp.c:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "�ndr kodes�tningen"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "�ndr kodes�tningen"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "�ndr kodes�tningen"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fejl i trailerlinie\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gener�r et nyt n�glepar"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, 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:2618
+#: scd/app-openpgp.c:2644
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
diff --git a/po/de.po b/po/de.po
index 61ad085d7..44605a25f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.10\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-06-08 09:58+0200\n"
-"PO-Revision-Date: 2009-06-08 10:05+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+0200\n"
+"PO-Revision-Date: 2009-06-17 11:49+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -96,15 +96,15 @@ msgstr "Passphrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 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:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1178,178 +1178,183 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 msgid "This command is only available for version 2 cards\n"
 msgstr "Dieser Befehl ist nur für Karten ab Version 2 möglich.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 msgid "Reset Code not or not anymore available\n"
 msgstr "Der Rückstellcode ist nicht vorhanden\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[nicht gesetzt]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "männlich"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "weiblich"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "unbestimmt"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "nicht zwingend"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "zwingend"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Familienname des Kartenbesitzers:"
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Vorname des Kartenbesitzers:"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, 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:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL um den öffentlichen Schlüssel zu holen: "
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, 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:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, c-format
+msgid "error writing `%s': %s\n"
+msgstr "Fehler beim Schreiben von %s: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Logindaten (Kontenname): "
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, 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:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Geheime DO-Daten: "
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, 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:927
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Spracheinstellungen"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Geschlecht: (Männlich (M), Weiblich (F) oder Leerzeichen): "
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ungültige Antwort.\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA-Fingerabdruck: "
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schlüsseloperation nicht möglich: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "Keine gültige OpenPGP-Karte"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 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:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1360,124 +1365,124 @@ msgstr ""
 "   PIN = `%s'     Admin-PIN = `%s'\n"
 "Sie sollten sie mittels des Befehls --change-pin ändern\n"
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr "   (1) Unterschriften-Schlüssel\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 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:1360
+#: g10/card-util.c:1442
 msgid "unknown key protection algorithm\n"
 msgstr "Unbekanntes Schlüssel-Schutzverfahren\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 msgid "secret parts of key are not available\n"
 msgstr "Geheime Teile des Schlüssels sind nicht vorhanden\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr "Geheimer Schlüssel ist bereits auf einer Karte gespeichert\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 msgid "show admin commands"
 msgstr "Zeige Admin-Befehle"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 msgid "list all available data"
 msgstr "Alle vorhandenen Daten auflisten"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr "Kartenbesitzernamen ändern"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr "Schlüssel-holen-URL ändern"
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr "Holen des Schlüssels mittels der URL auf der Karte"
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr "Ändern der Logindaten"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 msgid "change the language preferences"
 msgstr "Ändern der Spracheinstellungen"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr "Ändern des Geschlechts des Kartenbesitzers"
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 msgid "change a CA fingerprint"
 msgstr "Ändern des CA-Fingerabdrucks"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr "Umschalten des \"Signature-force-PIN\"-Schalters"
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 msgid "generate new keys"
 msgstr "neue Schlüssel erzeugen"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr "Menü für Ändern oder Entsperren der PIN"
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr "überprüfe die PIN und liste alle Daten auf"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr "die PIN mit dem Rückstellcode wieder freigeben"
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 msgid "Admin-only command\n"
 msgstr "nur-Admin Befehl\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr "Admin-Befehle sind erlaubt\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
@@ -1490,13 +1495,13 @@ msgstr "--output funktioniert nicht bei diesem Befehl\n"
 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:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4547,7 +4552,9 @@ msgstr ""
 msgid ""
 "Please enter a passphrase to protect the off-card backup of the new "
 "encryption key."
-msgstr "Bitte geben Sie die Passphrase ein, um die Sicherheitskopie des neuen Verschlüsselungsschlüssel der Karte zu schützen."
+msgstr ""
+"Bitte geben Sie die Passphrase ein, um die Sicherheitskopie des neuen "
+"Verschlüsselungsschlüssel der Karte zu schützen."
 
 #: g10/keygen.c:2225
 #, c-format
@@ -4817,138 +4824,138 @@ msgstr "abgeschaltet"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Eingabe von Nummern, Nächste (N) oder Abbrechen (Q) > "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "Ungültiges Schlüsselserverprotokoll (wir %d!=Handhabungsroutine %d)\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "Schlüssel \"%s\" wurde auf dem Schlüsselserver nicht gefunden\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 msgid "key not found on keyserver\n"
 msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "fordere Schlüssel %s von %s-Server %s an\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "fordere Schlüssel %s von %s an\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "suche Namen auf %s-Server %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "suche Namen auf %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "sende Schlüssel %s auf den %s-Server %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sende Schlüssel %s auf %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "suche nach \"%s\" auf %s-Server %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "suche nach \"%s\" auf %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 msgid "no keyserver action!\n"
 msgstr "Kein Schlüsselserver-Vorgang\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "WARNUNG: Die Schlüsselserver-Handhabungsroutine stammt von einer anderen "
 "GnuPG-Version (%s)\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr "Schlüsselserver sendete VERSION nicht\n"
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "Externe Schlüsselserveraufrufe werden in diesem \"Build\" nicht unterstützt\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "Keine Handhabungsroutine für Schlüsselserverschema `%s'\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "Vorgang `%s' wird vom Schlüsselserverschema `%s' nicht unterstützt\n"
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s unterstützt Hilfsroutinenversion %d nicht\n"
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 msgid "keyserver timed out\n"
 msgstr "Schlüsselserver-Zeitüberschreitung\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 msgid "keyserver internal error\n"
 msgstr "interner Fehler Schlüsselserver\n"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Schlüsselserver-Datenübertragunsfehler: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "WARNUNG: Schlüssel %s kann per %s nicht aktualisiert werden: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "ein Schlüssel wird per %s aktualisiert\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d Schlüssel werden per %s aktualisiert\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "WARNUNG: die URI %s kann nicht analysiert werden\n"
@@ -6643,19 +6650,19 @@ msgstr ""
 "Syntax: kbxutil [Optionen] [Dateien]\n"
 "Anlisten exportieren und Importieren von KeyBox Dateien\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, 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-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, 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-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
@@ -6711,192 +6718,192 @@ msgstr ""
 "|N|Bitte geben Sie den PIN Entsperrcode (PUK) für den Schlüssel zur "
 "Erstellung qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:1104
+#: scd/app-openpgp.c:1129
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 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:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "Die Standard PIN wird für %s benutzt\n"
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, 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:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 msgid "||Please enter the PIN"
 msgstr "||Bitte die PIN eingeben"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, 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:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, 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"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "|A|Bitte die Admin-PIN eingeben.%%0A[Verbliebene Versuche: %d]"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Bitte die Admin-PIN eingeben."
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 msgid "||Please enter the Reset Code for the card"
 msgstr "Bitte geben Sie den Rückstellcode für diese Karte ein"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Der Rückstellcode ist zu kurz; die Mindestlänge beträgt %d\n"
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr "|RN|Neuer Rückstellcode"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Neue Admin-PIN"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 msgid "error reading fingerprint DO\n"
 msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 msgid "key already exists\n"
 msgstr "Schlüssel existiert bereits\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr "Existierender Schlüssel wird ersetzt werden\n"
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 msgid "generating new key\n"
 msgstr "neue Schlüssel werden erzeugt\n"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr "Erzeugungsdatum fehlt\n"
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, 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:2618
+#: scd/app-openpgp.c:2644
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 msgid "generating key failed\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 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:2943
+#: scd/app-openpgp.c:2969
 #, 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:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "Die Überprüfung der Admin PIN ist momentan durch einen Befehl verboten "
 "worden\n"
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
diff --git a/po/el.po b/po/el.po
index c89cf5303..22870f9c8 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -92,15 +92,15 @@ msgstr "���� ����� ������"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1193,191 +1193,196 @@ msgstr "�������������: �������� �� ������ �������� ���������\n"
 msgid "not human readable"
 msgstr "�� ����������"
 
-#: g10/card-util.c:62 g10/card-util.c:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "�� ������� ������ ��� ����� ���������"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, fuzzy
 msgid "This command is only available for version 2 cards\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "������� ��� �������� �������� ��� ����� ���������\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "��� ���� ������� �����"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "�� �������������"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/card-util.c:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "�������� �������� ��� ����������� `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "����������� ��������"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1385,140 +1390,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/card-util.c:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "������ ��������� ���: "
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 #, fuzzy
 msgid "change the login name"
 msgstr "������ ��� ����������� �����"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "������> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
@@ -1531,13 +1536,13 @@ msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4929,141 +4934,141 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
@@ -6761,19 +6766,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6822,196 +6827,196 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: scd/app-openpgp.c:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "������ ��� ������ ������"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "������ ��� ������ ������"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "������ ��� ������ ������"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' ��� �����������\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
diff --git a/po/eo.po b/po/eo.po
index 198c11b97..ba988d454 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -92,15 +92,15 @@ msgstr "malbona pasfrazo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1200,191 +1200,196 @@ msgstr "AVERTO: nevalida notacia dateno trovita\n"
 msgid "not human readable"
 msgstr "ne homlegebla"
 
-#: g10/card-util.c:62 g10/card-util.c:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta �losilo ne havebla"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "en"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "en"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenia kialo specifita"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, 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:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1392,140 +1397,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
@@ -1538,13 +1543,13 @@ msgstr "--output ne funkcias por �i tiu komando\n"
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4906,141 +4911,141 @@ msgstr "el"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
@@ -6713,19 +6718,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6774,196 +6779,196 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, 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:682
+#: scd/app-openpgp.c:704
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: scd/app-openpgp.c:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Kialo por revoko: "
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "krei novan �losilparon"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, 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:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
diff --git a/po/es.po b/po/es.po
index 06d67a2f6..c0fcc9f66 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+0200\n"
 "PO-Revision-Date: 2008-12-14 19:34+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -112,15 +112,15 @@ msgstr "Frase contrase�a"
 msgid "ssh keys greater than %d bits are not supported\n"
 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:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1203,178 +1203,183 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tarjeta OpenPGP no disponible: %s\n"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 msgid "This command is only available for version 2 cards\n"
 msgstr "Esta orden solo est� disponible en tarjetas versi�n 2\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 msgid "Reset Code not or not anymore available\n"
 msgstr "No hay C�digo de Reinicio o ya no est� disponible\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[no establecido]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "hombre"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "mujer"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "no especificado"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "no forzado"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "forzado"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: s�lo se permite ASCII sin formato actualmente.\n"
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: El caracter \"<\" no puede usarse.\n"
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: no se permiten dobles espacios.\n"
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Apellido del titular de la tarjeta: "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Nombre del titular de la tarjeta: "
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, 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:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL de donde recuperar la clave p�blica: "
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, 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:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error reservando memoria: %s\n"
 
-#: g10/card-util.c:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "error escribiendo en `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Datos de login (nombre de la cuenta): "
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, 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:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Datos privados: "
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, 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:927
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: longitud de la cadena de preferencias inv�lida.\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: caracteres inv�lidos en cadena de preferencias.\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Error: respuesta no v�lida.\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "Huella dactilar CA:"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: formato inv�lido de huella dactilar.\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, 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:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, 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:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr "�Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 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:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr "�Reemplazar las claves existentes? (s/N) "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1385,124 +1390,124 @@ msgstr ""
 "   PIN = `%s'     PIN Administrador = `%s'\n"
 "Deber�a cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave que generar:\n"
 
-#: g10/card-util.c:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr "    (1) Clave de firmado\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clave de cifrado\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija donde guardar la clave:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n de clave desconocido\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 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:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 msgid "list all available data"
 msgstr "listar todos los datos disponibles"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr "cambiar el nombre del titular de la tarjeta"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr "cambiar URL de donde obtener la clave"
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr "recuperar la clave especificada en la URL de la tarjeta"
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 msgid "change the language preferences"
 msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr "cambiar sexo del titular de la tarjeta"
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 msgid "change a CA fingerprint"
 msgstr "cambiar huella dactilar de una CA"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr "cambiar estado de la opci�n forzar firma del PIN"
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 msgid "generate new keys"
 msgstr "generar nuevas claves"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr "men� para cambiar o desbloquear el PIN"
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr "verificar PIN y listar todos los datos"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr "desbloquear PIN usando C�digo de Reinicio"
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 msgid "Admin-only command\n"
 msgstr "�rdenes s�lo de administrador\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr "Se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
@@ -1515,13 +1520,13 @@ msgstr "--output no funciona con esta orden\n"
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4772,139 +4777,139 @@ msgstr "deshabilitado"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduzca n�mero(s), O)tro, o F)in >"
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clave \"%s\" no encontrada en el servidor\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 msgid "key not found on keyserver\n"
 msgstr "clave no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando clave %s de %s servidor %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %s de %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando nombres desde %s servidor %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando nombres de %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "enviando clave %s a %s servidor %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 msgid "no keyserver action!\n"
 msgstr "�no se solicita ninguna acci�n al servidor de claves!\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVISO: el manejo de claves procede de una versi�n diferente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr "el servidor de claves no envi� VERSION\n"
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "no se pueden realizar llamadas a un servidor externo de claves tal y\n"
 "como est� compilado el programa\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "la acci�n `%s' no es posible con este esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s no permite usar la versi�n %d del manejador\n"
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 msgid "keyserver timed out\n"
 msgstr "agotado el tiempo de espera para el servidor de claves\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 msgid "keyserver internal error\n"
 msgstr "error interno del servidor de claves\n"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "error de comunicaci�n con el servidor de claves: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "renovando 1 clave de %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "renovando %d claves desde %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: imposible recuperar URI %s: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: imposible interpretar URI %s\n"
@@ -6561,19 +6566,19 @@ msgstr ""
 "Sintaxis: kbxutil [opciones] [ficheros]\n"
 "listar, exportar, importar datos Keybox\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, 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-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, 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-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
@@ -6622,77 +6627,77 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallo leyendo clave p�blica: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr "la respuesta no incluye la clave p�blica\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr "la respuesta no incluye el m�dulo RSA\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 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:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "usando PIN por defecto %s\n"
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "fallo al usar el PIN por defecto %s: %s - en adelante deshabilitado\n"
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Por favor introduzca PIN%%0A[firmas hechas: %lu]"
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 msgid "||Please enter the PIN"
 msgstr "||Por favor introduzca PIN"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, 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:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificaci�n CHV%d fall�: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr "�la tarjeta est� bloqueada permanentemente!\n"
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6701,115 +6706,115 @@ msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr ""
 "|A|Introduzca PIN de Administrador en el teclado del lector%%0A[intentos "
 "restantes %d]"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Por favor introduzca PIN"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr "el acceso a �rdenes de administrador no est� configurado\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Por favor introduzca C�digo de Reinicio de la tarjeta"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "C�digo de Reinicio demasiado corto; longitud m�nima %d\n"
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr "|CR|Nuevo C�digo de Reinicio"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr "error leyendo datos de la aplicaci�n\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 msgid "error reading fingerprint DO\n"
 msgstr "error leyendo huella digital DO\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr "la clave existente ser� reemplazada\n"
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr "falta fecha de creaci�n\n"
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, 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:2618
+#: scd/app-openpgp.c:2644
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 msgid "generating key failed\n"
 msgstr "la generaci�n de la clave fall�\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generaci�n de clave completada (%d segundos)\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 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:2943
+#: scd/app-openpgp.c:2969
 #, 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:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 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:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
diff --git a/po/et.po b/po/et.po
index 62970c033..b532b8ede 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -92,15 +92,15 @@ msgstr "halb parool"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1191,191 +1191,196 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salajane v�ti ei ole k�ttesaadav"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "P�hjus puudub"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "ei t��deldud"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, 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:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1383,140 +1388,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, 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:1370
+#: g10/card-util.c:1452
 #, 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:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "V�tme leiate: "
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
@@ -1529,13 +1534,13 @@ msgstr "v�ti --output ei t��ta selle k�suga\n"
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4877,141 +4882,141 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
@@ -6682,19 +6687,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6743,196 +6748,196 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genereeri uus v�tmepaar"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, 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:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
diff --git a/po/fi.po b/po/fi.po
index 38351f4d0..6115aad56 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -108,15 +108,15 @@ msgstr "väärä salasana"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1210,191 +1210,196 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salaista avainta ei löydy"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Valintasi? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1402,140 +1407,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Komento> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
@@ -1548,13 +1553,13 @@ msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4916,141 +4921,141 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
@@ -6747,19 +6752,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6808,197 +6813,197 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 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:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
diff --git a/po/fr.po b/po/fr.po
index 9d9ee1a18..b25459400 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+0200\n"
 "PO-Revision-Date: 2008-09-30 19:38+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -98,15 +98,15 @@ msgstr "mauvaise phrase de passe"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1212,182 +1212,187 @@ msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 msgid "not human readable"
 msgstr "illisible par un humain"
 
-#: g10/card-util.c:62 g10/card-util.c:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la carte OpenPGP n'est pas disponible: %s\n"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/card-util.c:83
+#: g10/card-util.c:106
 #, fuzzy
 msgid "This command is only available for version 2 cards\n"
 msgstr "Cette commande n'est pas admise en mode %s.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[non positionn�]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "f�minin"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "non sp�cifi�"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "non forc�"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "forc�"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Erreur: Seul l'ASCII standard est permis pour l'instant.\n"
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Erreur: Le caract�re � < � ne peut pas �tre utilis�.\n"
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Erreur: Les espaces doubles ne sont pas permis.\n"
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Nom du d�teneur de la carte: "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Pr�nom du d�teneur de la carte: "
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Erreur: Nom combin� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL pour r�cup�rer la cl� publique: %s"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: g10/card-util.c:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Donn�es d'identification (nom du compte): "
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 "Erreur: Donn�es d'indentification trop longues (la limite est\n"
 "%d caract�res).\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Donn�es DO priv�es: "
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Erreur: DO priv� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Pr�f�rences de langue: "
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Erreur: longueur invalide de la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Erreur: caract�res invalide dans la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexe ((M)asculin, (F)�minin ou espace): "
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorit� de certification: "
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Erreur: empreinte mal format�e.\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "l'op�ration sur la cl� n'est pas possible: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr "Remplacer la cl� existante ? (o/N) "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Faire une sauvegarde hors carte de la cl� de chiffrement ? (O/n) "
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr "Remplacer les cl�s existantes ? (o/N) "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1398,126 +1403,126 @@ msgstr ""
 "   PIN = `%s'     PIN admin = `%s'\n"
 "Vous devriez les changer avec la commande --change-pin\n"
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 msgid "Please select the type of key to generate:\n"
 msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
 
-#: g10/card-util.c:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cl� de signature\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cl� de chiffrement\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 msgid "Please select where to store the key:\n"
 msgstr "S�lectionnez l'endroit o� stocker la cl�:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 msgid "unknown key protection algorithm\n"
 msgstr "algorithme de protection de cl� inconnu\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 msgid "secret parts of key are not available\n"
 msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 msgid "list all available data"
 msgstr "lister toutes les donn�es disponibles"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr "changer le nom du propri�taire de la carte"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr "changer l'URL pour r�cup�rer la cl�"
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr "aller chercher la cl� sp�cifi�e dans l'URL de la carte"
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr "changer le nom d'identification"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 msgid "change the language preferences"
 msgstr "changer les pr�f�rences de langue"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr "changer le sexe du propri�taire de la carte"
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 msgid "change a CA fingerprint"
 msgstr "changer l'empreinte d'une autorit� de certification"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 "inverser le param�tre obligeant � rentrer le code PIN pour les\n"
 "signatures"
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 msgid "generate new keys"
 msgstr "g�n�rer de nouvelles cl�s"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour changer ou d�verrouiller le PIN"
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr "v�rifier le code PIN et lister toutes les donn�es"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
@@ -1530,13 +1535,13 @@ msgstr "--output n'est pas compatible avec cette commande\n"
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4913,145 +4918,145 @@ msgstr "d�sactiv�"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocole serveur de cl�s invalide (nous %d!=gestionnaire %d)\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cl� � %s � introuvable dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 msgid "key not found on keyserver\n"
 msgstr "cl� non trouv�e dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "requ�te de la cl� %s du serveur %s %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requ�te de la cl� %s de %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "envoi de la cl� %s au serveur %s %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la cl� %s � %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 msgid "no keyserver action!\n"
 msgstr "pas d'action pour le serveur de cl�s !\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISSEMENT: le gestionnaire de serveurs de cl�s provient d'une\n"
 "version diff�rente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr "le serveurs de cl�s n'a pas envoy� son num�ro de VERSION\n"
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "pas de serveur de cl�s connu (utilisez l'option --keyserver)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "les appels externes � un serveur de cl� ne sont pas support�s dans\n"
 "cette compilation\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "pas de gestionnaire pour le type de serveurs de cl�s `%s'\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "l'action `%s' n'est pas support�e avec le type de serveurs\n"
 "de cl�s `%s'\n"
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s ne supporte pas le gestionnaire de version %d\n"
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 msgid "keyserver timed out\n"
 msgstr "le d�lai d'attente du serveur de cl�s a expir�\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 msgid "keyserver internal error\n"
 msgstr "erreur interne du serveur de cl�s\n"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "erreur de communication avec le serveur de cl�s: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "� %s � n'est pas une ID de cl�: ignor�\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "rafra�chissement d'une cl� depuis %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "rafra�chissement de %d cl�s depuis %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
@@ -6769,19 +6774,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "le module RSA est manquant ou bien sa taille n'est pas %d bits\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "l'exposant public RSA est manquant ou trop �lev� (plus de %d bits)\n"
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "l'appel du PIN a retourn� une erreur: %s\n"
@@ -6830,80 +6835,80 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "impossible de stocker la date de cr�ation: %s\n"
 
-#: scd/app-openpgp.c:1104
+#: scd/app-openpgp.c:1129
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr "la r�ponse ne contient pas les donn�es de cl� publique\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr "la r�ponse ne contient pas le modulo RSA\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 "Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
 "est %d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la v�rification CHV%d a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr "erreur pendant la r�cup�ration de l'�tat CHV de la carte\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6912,119 +6917,119 @@ msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 "Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
 "est %d\n"
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nouveau code PIN d'administration"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr "|N|Nouveau code PIN"
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr "erreur pendant la lecture de donn�es d'application\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 msgid "error reading fingerprint DO\n"
 msgstr "erreur pendant la lecture de l'empreinte DO\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 msgid "key already exists\n"
 msgstr "la cl� existe d�j�\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr "la cl� existante sera remplac�e\n"
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 msgid "generating new key\n"
 msgstr "g�n�rer une nouvelle cl�\n"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr "l'horodatage de cr�ation est manquant\n"
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "le nombre premier RSA %s est manquant ou bien sa taille n'est pas\n"
 "%d bits\n"
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr "attendez que la cl� se g�n�re...\n"
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 msgid "generating key failed\n"
 msgstr "la g�n�ration de la cl� a �chou�\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "la g�n�ration de cl� a �t� effectu�e (%d secondes)\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures cr��es jusqu'ici: %lu\n"
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "la v�rification du code PIN d'administration est actuellement interdite\n"
 "au travers de cette commande\n"
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
diff --git a/po/gl.po b/po/gl.po
index 9c2a573cb..b9d90395a 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -92,15 +92,15 @@ msgstr "contrasinal err�neo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1201,191 +1201,196 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "a chave secreta non est� dispo�ible"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Non se especificou un motivo"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "erro escribindo no chaveiro `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1393,140 +1398,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, 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:1370
+#: g10/card-util.c:1452
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispo�ible en: "
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
@@ -1539,13 +1544,13 @@ msgstr "--output non traballa con este comando\n"
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4928,142 +4933,142 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non � un ID de chave v�lido\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
@@ -6756,19 +6761,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6817,196 +6822,196 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, 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:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, 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:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, 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:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
diff --git a/po/hu.po b/po/hu.po
index 7f80886e4..365996b5c 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -92,15 +92,15 @@ msgstr "rossz jelsz�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1191,191 +1191,196 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Nincs megadva ok."
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenci�k friss�t�se"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, 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:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1383,140 +1388,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, 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:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, 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:1370
+#: g10/card-util.c:1452
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 #, fuzzy
 msgid "change the login name"
 msgstr "lej�rat megv�ltoztat�sa"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
@@ -1529,13 +1534,13 @@ msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4887,143 +4892,143 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
@@ -6714,19 +6719,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6775,196 +6780,196 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, 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:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "jelsz�v�ltoztat�s"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "jelsz�v�ltoztat�s"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "jelsz�v�ltoztat�s"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, 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:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, 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:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, 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:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
diff --git a/po/id.po b/po/id.po
index ce2c03709..d68f0edbe 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -94,15 +94,15 @@ msgstr "passphrase yang buruk"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1194,191 +1194,196 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1386,140 +1391,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
@@ -1532,13 +1537,13 @@ msgstr "--output tidak berfungsi untuk perintah ini\n"
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4897,141 +4902,141 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
@@ -6708,19 +6713,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6769,196 +6774,196 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: scd/app-openpgp.c:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
diff --git a/po/it.po b/po/it.po
index 54b30a148..ac97f8906 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -92,15 +92,15 @@ msgstr "passphrase errata"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1192,192 +1192,197 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la chiave segreta non � disponibile"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "abilita"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "abilita"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Nessuna ragione specificata"
 
 # ??? (Md)
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "non esaminato"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "errore scrivendo il portachiavi `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenze aggiornate"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1385,140 +1390,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "Chiave disponibile presso: "
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia la data di scadenza"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia il valore di fiducia"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
@@ -1531,13 +1536,13 @@ msgstr "--output non funziona con questo comando\n"
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4915,47 +4920,47 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
@@ -4963,94 +4968,94 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
@@ -6754,19 +6759,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6815,196 +6820,196 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "cambia la passphrase"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "cambia la passphrase"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "cambia la passphrase"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera una nuova coppia di chiavi"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
diff --git a/po/ja.po b/po/ja.po
index 9ca889f25..5cb88063f 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -96,15 +96,15 @@ msgstr "�ѥ��ե졼���������Ǥ�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1193,178 +1193,183 @@ msgstr "�ٹ�: ̵��������ǡ�����ȯ��\n"
 msgid "not human readable"
 msgstr "�ͤˤ��ɤ�ޤ���"
 
-#: g10/card-util.c:62 g10/card-util.c:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/card-util.c:83
+#: g10/card-util.c:106
 #, fuzzy
 msgid "This command is only available for version 2 cards\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "��̩��ʬ�������ޤ���\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "�����? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[̤����]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "��"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "��"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "̵����"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "̤����"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "����"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "���顼�� �Τ٤����ASCII�������������Ĥ���Ƥ��ޤ���\n"
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "���顼: ��<��ʸ���ϻȤ��ޤ���\n"
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "���顼: ��Ťζ���϶ػߤǤ���\n"
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "�����ɽ�ͭ�Ԥ��� (surname): "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "�����ɽ�ͭ�Ԥ�̾ (given name): "
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "���顼: �Ĥʤ���̾����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "��������õ������URL: "
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/card-util.c:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "���ء�%s�פν���ߥ��顼: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "�������󡦥ǡ��� (���������̾): "
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "���顼: �������󡦥ǡ�����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "���������: "
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "���顼: ����ʸ�����Ĺ����̵���Ǥ���\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "���顼: ����ʸ�����̵����ʸ��������ޤ���\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "���� ((M)�ˡ�(F)��������): "
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA�λ���: "
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "���顼: ̵���ʷ����λ��档\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "�������Ǥ��ޤ���: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "OpenPGP�����ɤǤ���ޤ���"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr "��¸�θ���򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "�Ź渰�򥫡��ɳ��˥Хå����åפ��ޤ���? (Y/n) "
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr "��¸�θ�����򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1375,124 +1380,124 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "���Υ��ޥ�ɤ�Ȥä��ѹ����٤��Ǥ� --change-pin\n"
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 msgid "Please select the type of key to generate:\n"
 msgstr "�������븰�η������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr "   (1) ��̾��\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �Ź沽��\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 msgid "Please select where to store the key:\n"
 msgstr "�����ݴɾ������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 msgid "unknown key protection algorithm\n"
 msgstr "̤�Τθ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 msgid "secret parts of key are not available\n"
 msgstr "������̩��ʬ��̵���Ǥ�\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 msgid "list all available data"
 msgstr "��ͭ���ǡ�����ɽ��"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr "�����ɽ�ͭ�Ԥ�̾�����ѹ�"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr "����õ������URL���ѹ�"
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr "������URL�ǻ��ꤵ�줿���ΰ����Ф�"
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr "��������̾���ѹ�"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 msgid "change the language preferences"
 msgstr "�����������ѹ�"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr "�����ɽ�ͭ�Ԥ����̤��ѹ�"
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 msgid "change a CA fingerprint"
 msgstr "CA������ѹ�"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr "��̾����PIN�ե饰��ȿž"
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 msgid "generate new keys"
 msgstr "����������������"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 msgid "Admin-only command\n"
 msgstr "�������ѥ��ޥ��\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
@@ -1505,13 +1510,13 @@ msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4773,135 +4778,135 @@ msgstr "disabled"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "����%s�ɤ��������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 msgid "key not found on keyserver\n"
 msgstr "�����������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "��%s��%s���饵���С�%s���׵�\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "��%s��%s���׵�\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��%s��%s�����С�%s������\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "��%s��%s������\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 msgid "no keyserver action!\n"
 msgstr "�������С�����������󤬤���ޤ���!\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 msgid "keyserver timed out\n"
 msgstr "�������С��Υ����ॢ����\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 msgid "keyserver internal error\n"
 msgstr "�������С����������顼\n"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "�������С��̿����顼: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�ǲ����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�ǲ����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�ǲ����Ǥ��ޤ���: %s\n"
@@ -6531,19 +6536,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
@@ -6592,193 +6597,193 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, 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:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "|A|������Admin PIN"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 #, fuzzy
 msgid "|N|New PIN"
 msgstr "������PIN"
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 msgid "error reading fingerprint DO\n"
 msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 msgid "key already exists\n"
 msgstr "���Ϥ⤦����ޤ�\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 msgid "generating new key\n"
 msgstr "��������������\n"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr "�������δ֡����Ԥ��������� ...\n"
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 msgid "generating key failed\n"
 msgstr "���������˼��Ԥ��ޤ���\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "������������λ���ޤ��� (%d��)\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
diff --git a/po/nb.po b/po/nb.po
index 302900f84..c88308d5d 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -96,15 +96,15 @@ msgstr "ugyldig passfrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1181,177 +1181,182 @@ msgstr "ingen gyldig OpenPGP-data funnet.\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnummer %s oppdaget\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 msgid "Reset Code not or not anymore available\n"
 msgstr ""
 
-#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Ditt valg? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[ikke satt]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "mann"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "dame"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "uspesifisert"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Feil: Bare ren ASCII er forel�pig tillatt.\n"
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Feil: Tegnet �<� kan ikke brukes.\n"
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Kortholders etternavn: "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, 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:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL for � hente offentlig n�kkel: "
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, 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:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Logindata (kontonavn): "
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, 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:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, 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:927
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Spr�kpreferanser:"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Feil: ugyldig lengde p� preferansestrengen.\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Feil: ugyldig tegn i preferansestrengen.\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kj�nn ((M)ale, (F)emale eller mellomrom): "
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Feil: ugyldig respons.\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtrykk: "
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "n�kkeloperasjonen er umulig: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, 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:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr "Erstatte eksisterende n�kkel? (j/N) "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Lage sikkerhetskopi av krypteringsn�kler utenfor kortet? (J/n) "
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstatte eksisterende n�kler? (j/N) "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1362,124 +1367,124 @@ msgstr ""
 "   PIN = �%s�     Admin PIN = �%s�\n"
 "Du b�r endre dem med kommandoen --change-pin\n"
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signaturn�kkel\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsn�kkel\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsn�kkel\n"
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 msgid "Please select where to store the key:\n"
 msgstr "Vennligst velg hvor n�kkelen skal lagres:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 msgid "unknown key protection algorithm\n"
 msgstr "ukjent n�kkelbeskyttelsesalgoritme\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 msgid "secret parts of key are not available\n"
 msgstr "hemmelige deler av n�kkelen er ikke tilgjengelig.\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "avslutte denne menyen"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 msgid "show admin commands"
 msgstr "vise admin-kommandoer"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "vise denne hjelpen"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 msgid "list all available data"
 msgstr "vis alle tilgjengelige data"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr "endre kortholders navn"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr "endre URL for � hente n�kkel"
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 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:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr "endre loginnavnet"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 msgid "change the language preferences"
 msgstr "endre spr�kpreferansene"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr "endre kortholders kj�nn"
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 msgid "change a CA fingerprint"
 msgstr "vise et CA-fingeravtrykk"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr "veksle tving-signatur-PIN-flagget"
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 msgid "generate new keys"
 msgstr "generere nye n�kler"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr "meny for � endre eller fjerne blokkering av PIN"
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 msgid "Admin-only command\n"
 msgstr "Admin-reservert kommando\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr "Admin-kommandoer er tillatt\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (pr�v �help�)\n"
 
@@ -1492,13 +1497,13 @@ msgstr "--output virker ikke for denne kommandoen\n"
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4720,135 +4725,135 @@ msgstr "utkoblet"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "n�kkelen �%s� ble ikke funnet p� n�kkelserveren\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 msgid "key not found on keyserver\n"
 msgstr "n�kkelen ble ikke funnet p� n�kkelserver\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "ber om n�kkelen %s fra %s server %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "ber om n�kkel %s fra %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "s�ke etter navn fra %s server %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "s�ker etter navn fra %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s�ke etter �%s� fra %s server %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s�ker etter �%s� fra %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 msgid "no keyserver action!\n"
 msgstr "ingen handling for n�kkelserver!\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr "n�kkelserver sendte ikke VERSION\n"
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 msgid "keyserver timed out\n"
 msgstr "n�kkelserver svarte ikke tidsnok\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 msgid "keyserver internal error\n"
 msgstr "intern feil ved n�kkelserver\n"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikasjonsfeil med n�kkelserver: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � oppfriske n�kkel %s via %s: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "oppfrisker 1 n�kkel fra %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "oppfrisker %d n�kler fra %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ADVARSEL: klarte ikke � parse URI %s\n"
@@ -6470,19 +6475,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, 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-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, 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-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
@@ -6531,191 +6536,191 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
 
-#: scd/app-openpgp.c:1104
+#: scd/app-openpgp.c:1129
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr "respons inneholder ikke data om offentlig n�kkel\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr "respons inneholder ikke RSA-modulus\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, 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:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, 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:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr "feil ved henting av CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent l�st!\n"
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, 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"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, 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:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr "feil ved lesing av applikasjonsdata\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 msgid "error reading fingerprint DO\n"
 msgstr "feil ved lesing av fingeravtrykk DO\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 msgid "key already exists\n"
 msgstr "n�kkel finnes allerede\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr "eksisterende n�kkel vil bli erstattet\n"
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 msgid "generating new key\n"
 msgstr "generere en ny n�kkel\n"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr "tidsstempel for opprettelse mangler\n"
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, 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:2618
+#: scd/app-openpgp.c:2644
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr "vennligst vent mens n�kkel blir generert ...\n"
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 msgid "generating key failed\n"
 msgstr "n�kkelgenerering mislyktes\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "n�kkelgenerering fullf�rt (%d sekunder)\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet st�tter ikke digestalgoritme %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet s� langt: %lu\n"
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 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:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
diff --git a/po/pl.po b/po/pl.po
index c2e819375..003a4ada5 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -92,15 +92,15 @@ msgstr "Has�o"
 msgid "ssh keys greater than %d bits are not supported\n"
 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:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1193,178 +1193,183 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Karta OpenPGP niedost�pna: %s\n"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Wykryto kart� OpenPGP nr %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[nie ustawiono]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "m�czyzna"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "kobieta"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "nie podano"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "nie wymuszono"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "wymuszono"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "B��d: aktualnie dopuszczalne jest tylko czyste ASCII.\n"
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "B��d: znak ,,<'' nie mo�e by� u�yty.\n"
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "B��d: podw�jne spacje nie s� dopuszczalne.\n"
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Nazwisko posiadacza karty: "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Imi� posiadacza karty: "
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, 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:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL do odczytania klucza publicznego: "
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, 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:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "b��d zapisu do %s: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Dane logowania (nazwa konta): "
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, 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:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Prywatne dane DO: "
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, 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:927
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Preferowane j�zyki: "
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "B��d: niew�a�ciwa d�ugo�� tekstu preferencji.\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "B��d: niew�a�ciwe znaki w tek�cie preferencji.\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "P�e� (M - m�czyzna, F - kobieta lub spacja): "
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "B��d: niew�a�ciwa odpowied�.\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "Odcisk CA:"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "B��d: niew�a�ciwie sformatowany odcisk.\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operacja na kluczu niewykonalna: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "to nie jest karta OpenPGP"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, 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:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr "Zast�pi� istniej�cy klucz? (t/N) "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 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:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr "Zast�pi� istniej�ce klucze? (t/N) "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1375,124 +1380,124 @@ msgstr ""
 "   PIN = ,,%s''   PIN administratora = ,,%s''\n"
 "Nale�y je zmieni� przy u�yciu polecenia --change-pin\n"
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosz� wybra� rodzaj klucza do wygenerowania:\n"
 
-#: g10/card-util.c:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr "   (1) Klucz do podpis�w\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Klucz do szyfrowania\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Klucz do uwierzytelniania\n"
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 msgid "Please select where to store the key:\n"
 msgstr "Prosz� wybra� gdzie zapisa� klucz:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 msgid "unknown key protection algorithm\n"
 msgstr "nieznany algorytm ochrony klucza\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 msgid "secret parts of key are not available\n"
 msgstr "cz�ci tajne klucza s� niedost�pne\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr "klucz prywatny jest ju� zapisany na karcie\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 msgid "show admin commands"
 msgstr "pokazanie polece� administratora"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 msgid "list all available data"
 msgstr "wypisanie wszystkich dost�pnych danych"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr "zmiana nazwy posiadacza karty"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr "zmiana URL-a do odczytu klucza"
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr "pobranie klucza okre�lonego w URL-u karty"
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr "zmiana nazwy logowania"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 msgid "change the language preferences"
 msgstr "zmiana preferowanych j�zyk�w"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr "zmiana p�ci posiadacza karty"
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 msgid "change a CA fingerprint"
 msgstr "zmiana odcisku CA"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr "zmiana flagi wymuszenia PIN-u do podpisu"
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 msgid "generate new keys"
 msgstr "wygenerowanie nowych kluczy"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr "menu do zmiany lub odblokowania PIN-u"
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr "sprawdzenie PIN-u i wypisanie wszystkich danych"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 msgid "Admin-only command\n"
 msgstr "Polecenie tylko dla administratora\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr "Polecenia dla administratora s� dozwolone\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr "Polecenia dla administratora nie s� dozwolone\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawne polecenie  (spr�buj ,,help'')\n"
 
@@ -1505,13 +1510,13 @@ msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4812,137 +4817,137 @@ msgstr "wy��czony"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Wprowad� numer(y), N)ast�pny lub Q)uit > "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "niepoprawny protok� serwera kluczy (nasz %d != modu� obs�ugi %d)\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony na serwerze kluczy\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 msgid "key not found on keyserver\n"
 msgstr "klucz nie zosta� odnaleziony na serwerze kluczy\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "zapytanie o klucz %s z serwera %s %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %s z %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "poszukiwanie nazw z serwera %s %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "poszukiwanie nazw z %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "wysy�anie klucza %s na serwer %s %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "wysy�anie klucza %s na %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "poszukiwanie ,,%s'' z serwera %s %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "poszukiwanie ,,%s'' z %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 msgid "no keyserver action!\n"
 msgstr "brak akcji serwera kluczy!\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "OSTRZE�ENIE: modu� obs�ugi serwera kluczy z innej wersji GnuPG (%s)\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr "serwer kluczy nie wys�a� VERSION\n"
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "zewn�trzne wywo�ania serwera kluczy nie s� obs�ugiwane w tej kompilacji\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "brak modu�u obs�ugi dla schematu serwera kluczy ,,%s''\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "akcja ,,%s'' nie jest obs�ugiwana przez schemat serwera kluczy ,,%s''\n"
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nie obs�uguje modu�u obs�ugi w wersji %d\n"
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 msgid "keyserver timed out\n"
 msgstr "zbyt d�ugi czas oczekiwania na serwer kluczy\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 msgid "keyserver internal error\n"
 msgstr "b��d wewn�trzny serwera kluczy\n"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "b��d komunikacji z serwerem kluczy: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ",,%s'' nie jest identyfikatorem klucza - pomini�to\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na od�wie�y� klucza %s przez %s: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "od�wie�anie 1 klucza z %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "od�wie�anie %d kluczy z %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na pobra� URI %s: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na przeanalizowa� URI %s\n"
@@ -6604,19 +6609,19 @@ msgstr ""
 "Sk�adnia: kbxutil [opcje] [pliki]\n"
 "wypisywanie, eksport, import danych Keybox\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, 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-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, 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-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Zapytanie zwrotne o PIN zwr�ci�o b��d: %s\n"
@@ -6665,193 +6670,193 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nie powi�d� si� zapis odcisku: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "odczyt klucza publicznego nie powi�d� si�: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr "odpowied� nie zawiera danych klucza publicznego\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpowied� nie zawiera wsp�czynnika RSA\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpowied� nie zawiera publicznego wyk�adnika RSA\n"
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Prosz� wpisa� PIN%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Prosz� wpisa� PIN%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, 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:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "weryfikacja CHV%d nie powiod�a si�: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr "b��d podczas odczytu stanu CHV z karty\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr "karta zosta�a trwale zablokowana!\n"
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, 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"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr ""
 "||Prosz� wprowadzi� PIN na klawiaturze czytnika%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Prosz� wpisa� PIN%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr "dost�p do polece� administratora nie zosta� skonfigurowany\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Prosz� wprowadzi� PIN%s%s%s aby odblokowa� kart�"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, 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:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nowy PIN administratora"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr "|N|Nowy PIN"
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr "b��d podczas odczytu danych aplikacji\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 msgid "error reading fingerprint DO\n"
 msgstr "b��d podczas odczytu odcisku DO\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 msgid "key already exists\n"
 msgstr "klucz ju� istnieje\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr "istniej�cy klucz zostanie zast�piony\n"
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 msgid "generating new key\n"
 msgstr "generowanie nowego klucza\n"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr "brak datownika utworzenia\n"
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, 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:2618
+#: scd/app-openpgp.c:2644
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nie powi�d� si� zapis klucza: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr "prosz� czeka� na wygenerowanie klucza...\n"
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 msgid "generating key failed\n"
 msgstr "generowanie klucza nie powiod�o si�\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generowanie klucza zako�czone (%d sekund)\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr "odcisk na karcie nie zgadza si� z ��danym\n"
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, 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:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dotychczas stworzono podpis�w: %lu\n"
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 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:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie mo�na dosta� si� do %s - niepoprawna karta OpenPGP?\n"
diff --git a/po/pt.po b/po/pt.po
index d0800ec20..35f7ff5cc 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -95,15 +95,15 @@ msgstr "frase secreta incorrecta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1197,191 +1197,196 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "erro na escrita do porta-chaves `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncias actualizadas"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, 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:944
+#: g10/card-util.c:1019
 #, 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:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, 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:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1389,140 +1394,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, 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:1370
+#: g10/card-util.c:1452
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -1535,13 +1540,13 @@ msgstr "--output n�o funciona para este comando\n"
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4899,141 +4904,141 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
@@ -6720,19 +6725,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6781,196 +6786,196 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, 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:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "motivo da revoca��o: "
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%s' j� comprimido\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, 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:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 45b8ef749..9b000f5f3 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+0200\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -99,15 +99,15 @@ msgstr "frase secreta incorreta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1203,191 +1203,196 @@ msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 msgid "This command is only available for version 2 cards\n"
 msgstr ""
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado(s)"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "lista prefer�ncias"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Impress�o digital:"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1395,141 +1400,141 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -1542,13 +1547,13 @@ msgstr ""
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -4910,141 +4915,141 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
@@ -6725,19 +6730,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6786,196 +6791,196 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, 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:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%lu chaves processadas\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, 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:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
diff --git a/po/ro.po b/po/ro.po
index 0274e6cb5..75de5f020 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -98,15 +98,15 @@ msgstr "fraz�-parol� incorect�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1200,178 +1200,183 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "cardul OpenPGP nu e disponibil: %s\n"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[nesetat(�)]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "feminin"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "nespecificat(�)"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "nefor�at(�)"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "for�at(�)"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Eroare: Deocamdat� sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Eroare: Spa�iile duble nu sunt permise.\n"
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, 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:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL pentru a aduce cheia public�: "
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, 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:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "eroare la scrierea inelului de chei `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, 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:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, 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:927
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Preferin�e limb�: "
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Eroare: lungime invalid� pentru �ir preferin�e.\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Eroare: caractere invalide �n �ir preferin�e.\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sex ((M)asculin, (F)eminin sau spa�iu): "
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Eroare: amprent� formatat� invalid.\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "opera�ia pe cheie nu e posibil�: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, 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:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr "�nlocuiesc cheia existent�? (d/N) "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 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:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr "�nlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1382,124 +1387,124 @@ msgstr ""
 "   PIN = `%s'     PIN Admin = `%s'\n"
 "Ar trebui s� le schimba�i folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 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:1360
+#: g10/card-util.c:1442
 msgid "unknown key protection algorithm\n"
 msgstr "algoritm de protec�ie a cheii necunoscut\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 msgid "secret parts of key are not available\n"
 msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 msgid "list all available data"
 msgstr "afi�eaz� toate datele disponibile"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr "schimb� numele purt�torului cardului"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr "schimb� URL-ul de unde s� fie adus� cheia"
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr "adu cheia specificat� de URL-ul de pe card"
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr "schimb� numele de login"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 msgid "change the language preferences"
 msgstr "schimb� preferin�ele de limb�"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr "schimb� sexul purt�torului cardului"
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 msgid "change a CA fingerprint"
 msgstr "schimb� o amprent� CA"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr "comut� fanionul PIN de for�are a semn�turii"
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 msgid "generate new keys"
 msgstr "genereaz� noi chei"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr "verific� PIN-ul �i listeaz� toate datele"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Comand�> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 msgid "Admin-only command\n"
 msgstr "Comand� numai-administrare\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
@@ -1512,13 +1517,13 @@ msgstr "--output nu merge pentru aceast� comand�\n"
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4815,138 +4820,138 @@ msgstr "deactivat(�)"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cheia \"%s\" nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 msgid "key not found on keyserver\n"
 msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "cer cheia %s de la serverul %s %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "trimit cheia %s serverului %s %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 msgid "no keyserver action!\n"
 msgstr "nici o ac�iune pentru serverul de chei!\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISMENT: manipulator server de chei dintr-o versiune diferit� de GnuPG (%"
 "s)\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "apeluri c�tre server de chei extern nu este suportat de acest program\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "ac�iunea `%s' nu este suportat� cu schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nu suport� versiunea de manipulator (handler) %d\n"
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 msgid "keyserver timed out\n"
 msgstr "serverul de chei a epuizat timpul de a�teptare (timed out)\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 msgid "keyserver internal error\n"
 msgstr "eroare intern� server de chei\n"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "eroare de comunicare server de chei: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "reactualizez 1 cheie de la %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "reactualizez %d chei de la %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
@@ -6614,19 +6619,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, 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-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, 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-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
@@ -6675,192 +6680,192 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr "r�spunsul nu con�ine datele cheii publice\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr "r�spunsul nu con�ine modulul RSA\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr "r�spunsul nu con�ine exponentul public RSA\n"
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, 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:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, 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:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea st�rii CHV de pe card\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr "cardul este �ncuiat permanent!\n"
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, 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"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr "accesul la comenzile de administrare nu este configurat�\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, 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:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, 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:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplica�iei\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 msgid "key already exists\n"
 msgstr "cheia exist� deja\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr "cheia existent� va fi �nlocuit�\n"
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 msgid "generating new key\n"
 msgstr "generez o nou� cheie\n"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr "timestamp-ul de creare lipse�te\n"
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, 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:2618
+#: scd/app-openpgp.c:2644
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 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:2717
+#: scd/app-openpgp.c:2743
 msgid "generating key failed\n"
 msgstr "generarea cheii a e�uat\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generarea cheii este complet� (%d secunde)\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 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:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
diff --git a/po/ru.po b/po/ru.po
index 17898bb3f..08edbcdeb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.0.10\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+0200\n"
 "PO-Revision-Date: 2008-12-21 00:40+0200\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -90,15 +90,15 @@ msgstr "Фраза-пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1169,176 +1169,181 @@ msgstr "ВНИМАНИЕ: обнаружено недопустимое прим
 msgid "not human readable"
 msgstr "не читаемое человеком"
 
-#: g10/card-util.c:62 g10/card-util.c:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Карта OpenPGP недоступна: %s\n"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
-#: g10/card-util.c:83
+#: g10/card-util.c:106
 msgid "This command is only available for version 2 cards\n"
 msgstr "Данная команда допустима только для карт версии 2\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 msgid "Reset Code not or not anymore available\n"
 msgstr "Reset Code не задан или недоступен\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[не установлено]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "мужской"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "женский"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "не задан"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "отключен"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "включен"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Ошибка: Допустим только чистый ASCII.\n"
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Ошибка: Нельзя использовать символ \"<\".\n"
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопустимы.\n"
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Фамилия владельца карты:"
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Имя владельца карты:"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Ошибка: Скомбинированное имя слишком длинное (предел %d символов).\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL для получения открытого ключа: "
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Ошибка: URL слишком длинный (предел - %d символов).\n"
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "ошибка распределения памяти: %s\n"
 
-#: g10/card-util.c:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "ошибка записи в `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Учетная запись (имя):"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Ошибка: Данные учетной записи слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Секретные DO данные:"
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Ошибка: Секретные DO данные слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Предпочитаемый язык: "
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Пол ((M)Мужской, (F)Женский или пробел): "
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопустимый ответ.\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "отпечаток CA: "
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: неправильный формат отпечатка.\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операция с ключом невозможна: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "карта не OpenPGP"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить существующий ключ? (y/N) "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Сделать резервную копию ключа шифрования вне карты? (Y/n)"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить существующие ключи? (y/N) "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1349,124 +1354,124 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Следует изменить их используя команду --change-pin\n"
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип создаваемого ключа:\n"
 
-#: g10/card-util.c:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ подписи\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифрования\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где сохранить ключ:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 msgid "unknown key protection algorithm\n"
 msgstr "неизвестный алгоритм защиты ключа\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 msgid "secret parts of key are not available\n"
 msgstr "секретные части ключа недоступны\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "показать данную справку"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 msgid "list all available data"
 msgstr "вывести все доступные данные"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr "изменить имя владельца карты"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr "изменить URL получения ключа"
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr "запросить ключ, указанный по заданному картой URL"
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr "изменить учетное имя"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 msgid "change the language preferences"
 msgstr "изменить языковые предпочтения"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr "изменение пола владельца карты"
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 msgid "change a CA fingerprint"
 msgstr "сменить отпечаток CA"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 msgid "generate new keys"
 msgstr "сгенерировать новые ключи"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменения или разблокировки PIN"
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN и показать все данные"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr "разблокировать PIN используя Reset Code"
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 msgid "Admin-only command\n"
 msgstr "Команды администратора\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr "Команды администрирования разрешены\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
@@ -1479,13 +1484,13 @@ msgstr "--output не работает для данной команды\n"
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4715,135 +4720,135 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Введите число(а), N) Следующий или Q) Выход> "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ \"%s\" не найден на сервере ключей\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 msgid "key not found on keyserver\n"
 msgstr "ключ не найден на сервере ключей\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "запрашиваю ключ %s с %s сервера %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "получение ключа %s с %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "поиск по именам %s на сервере %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "поиск по именам на %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "отправляю ключ %s на %s сервер %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 msgid "no keyserver action!\n"
 msgstr ""
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "ВНИМАНИЕ: обработчик сервера ключей от другой версии GnuPG (%s)\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr "сервер ключей не прислал VERSION\n"
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "не заданы серверы ключей (используйте --keyserver)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "данная сборка не поддерживает внешние вызовы для сервера ключей.\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "нет обработчика для схемы сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "действие `%s' не поддерживается схемой сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s не поддерживает версию обработчика %d\n"
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 msgid "keyserver timed out\n"
 msgstr "превышено время ожидания сервера ключей\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 msgid "keyserver internal error\n"
 msgstr "ошибка сервера ключей\n"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ошибка связи с сервером ключей: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "обновление 1 ключа из %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "обновление %d ключей из %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно загрузить ссылку %s: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ВНИМАНИЕ: невозможно проанализировать ссылку %s\n"
@@ -6493,19 +6498,19 @@ msgstr ""
 "Синтаксис: kbxutil [параметры] [файлы]\n"
 "просморт, экспорт, импорт данных Keybox\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6554,191 +6559,191 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "сбой сохранения отпечатка: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "сбой сохранения даты создания: %s\n"
 
-#: scd/app-openpgp.c:1104
+#: scd/app-openpgp.c:1129
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "сбой чтения открытого ключа: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr "ответ не содержит данных открытого ключа\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе отсутствует модуль RSA\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 msgid "||Please enter the PIN"
 msgstr "||Введите PIN"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, 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:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "при проверке CHV%d сбой: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr "карта заблокирована!\n"
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "осталось %d попыток ввода административного PIN до блокировки карты\n"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr ""
 "|A|Введите Admin PID на клавиатуре считывателя%%0A[осталось попыток: %d]"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Введите PIN"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr "доступ к командам управления не настроен\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Введите Reset Code к карте"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Reset Code слишком короток, минимальная длина %d\n"
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr "|RN| Новый Reset Code"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новый административный PIN"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr "|N|Новый PIN"
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr "ошибка чтения данных приложения\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтения отпечатка DO\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 msgid "key already exists\n"
 msgstr "ключ уже существует\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr "существующий ключ будет заменен\n"
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 msgid "generating new key\n"
 msgstr "генерация нового ключа\n"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr "пропущен штамп создания создания\n"
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 msgid "generating key failed\n"
 msgstr "сбой при генерации ключа\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "ключ сгенерирован (%d секунд)\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карта не поддерживает функцию хеширования %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "подписей создано: %lu\n"
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещена этой командой\n"
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
diff --git a/po/sk.po b/po/sk.po
index 6af8baee7..f38bb8b9d 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -91,15 +91,15 @@ msgstr "nespr�vne heslo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1193,191 +1193,196 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tajn� k��� nie je dostupn�"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "nespracovan�"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizova� predvo�by"
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, 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:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1385,140 +1390,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 #, 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 #, 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:1360
+#: g10/card-util.c:1442
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 #, 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:1370
+#: g10/card-util.c:1452
 #, 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:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "list all available data"
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeni� dobu platnosti"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Pr�kaz> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
@@ -1531,13 +1536,13 @@ msgstr "--output pre tento pr�kaz nefunguje\n"
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4905,141 +4910,141 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podp�san� Va��m k���om %08lX v %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
@@ -6730,19 +6735,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6791,196 +6796,196 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, 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:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "zmeni� heslo"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "zmeni� heslo"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "zmeni� heslo"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, 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:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 #, fuzzy
 msgid "generating new key\n"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, 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:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
diff --git a/po/sv.po b/po/sv.po
index b4abebf17..bf4437ae9 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -115,15 +115,15 @@ msgstr "Lösenfras"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1205,178 +1205,183 @@ msgstr "VARNING: ogiltig notationsdata hittades\n"
 msgid "not human readable"
 msgstr "inte läsbart"
 
-#: g10/card-util.c:62 g10/card-util.c:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 #, 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:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, 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:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[inte inställt]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "man"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "kvinna"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "ej angiven"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "inte tvingad"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "tvingad"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 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:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fel: Tecknet \"<\" får inte användas.\n"
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, 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:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "Url för att hämta publik nyckel: "
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, 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:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 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:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "fel vid skrivning till \"%s\": %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, 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:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, 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:927
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fel: ogiltig längd på inställningssträngen\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nyckelåtgärden är inte möjlig: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 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:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1387,126 +1392,126 @@ msgstr ""
 "   PIN-kod = \"%s\"     Admin PIN-kod = \"%s\"\n"
 "Du bör ändra dem med kommandot --change-pin\n"
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 msgid "Please select where to store the key:\n"
 msgstr "Välj var nyckeln ska sparas:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 msgid "unknown key protection algorithm\n"
 msgstr "okänd nyckelskyddsalgoritm\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 msgid "secret parts of key are not available\n"
 msgstr "hemliga delar av nyckeln är inte tillgängliga.\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr "hemlig nyckel redan lagrad på ett kort\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 msgid "list all available data"
 msgstr "lista allt tillgängligt data"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr "ändra url för att hämta nyckel"
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr "hämta nyckel som anges i kortets url"
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr "ändra inloggningsnamnet"
 
 # originalet borde ha ett value
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr "ändra kortinnehavarens kön"
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 msgid "change a CA fingerprint"
 msgstr "ändra ett CA-fingeravtryck"
 
 # den låter skum
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr "växla flagga för att tvinga signatur-PIN-kod"
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr "meny för att ändra eller avblockera PIN-koden"
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr "validera PIN-koden och lista allt data"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (prova med \"help\")\n"
 
@@ -1520,13 +1525,13 @@ msgstr "--output kan inte användas för detta kommando\n"
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4842,135 +4847,135 @@ msgstr "inaktiverad"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 msgid "key not found on keyserver\n"
 msgstr "nyckeln hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "begär nyckeln %s från %s-servern %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckeln %s från %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "söker efter namn från %s-servern %s\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "söker efter namn från %s\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "skickar nyckeln %s till %s-servern %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "skickar nyckeln %s till %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "söker efter \"%s\" från %s-servern %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "söker efter \"%s\" från %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 msgid "no keyserver action!\n"
 msgstr "ingen nyckelserveråtgärd!\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VARNING: nyckelserverhanteraren från en annan version av GnuPG (%s)\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr "nyckelserver skickade inte VERSION\n"
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "externa anrop till nyckelserver stöds inte i detta bygge\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "ingen hanterare för nyckelserverschemat \"%s\"\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "åtgärden \"%s\" stöds inte med nyckelserverschemat \"%s\"\n"
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s har inte stöd för hanterarversionen %d\n"
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 msgid "keyserver timed out\n"
 msgstr "tidsgräns överstigen för nyckelserver\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 msgid "keyserver internal error\n"
 msgstr "internt fel i nyckelserver\n"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikationsfel mot nyckelserver: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kunde inte uppdatera nyckeln %s via %s: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "uppdaterar 1 nyckel från %s\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "uppdaterar %d nycklar från %s\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VARNING: kunde inte tolka uri:n %s\n"
@@ -6674,19 +6679,19 @@ msgstr ""
 "Syntax: kbxutil [flaggor] [filer]\n"
 "lista, exportera, importera nyckelskåpsdata\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, 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-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, 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-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-återanrop returnerade fel: %s\n"
@@ -6735,197 +6740,197 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "läsning av publik nyckel misslyckades: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr "svaret innehåller inte publikt nyckeldata\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr "svaret innehåller inte en RSA-modulus\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "använder standard-PIN som %s\n"
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, 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:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, 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:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "validering av CHV%d misslyckades: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr "fel vid hämtning av CHV-status från kort\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr "kortet är låst permanent!\n"
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, 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"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr ""
 "|A|Ange administratörens PIN-kod på läsarens knappsats%%0A[återstående "
 "försök: %d]"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, 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:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, 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:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN-kod"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN-kod"
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr "fel vid läsning av programdata\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 msgid "error reading fingerprint DO\n"
 msgstr "fel vid läsning av fingeravtryckets DO\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 msgid "key already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr "befintlig nyckel kommer att ersättas\n"
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 msgid "generating new key\n"
 msgstr "genererar ny nyckel\n"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr "tidsstämpel för skapandet saknas\n"
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, 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:2618
+#: scd/app-openpgp.c:2644
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att lagra nyckeln: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr "var god vänta under tiden nyckeln genereras ...\n"
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 msgid "generating key failed\n"
 msgstr "nyckelgenereringen misslyckades\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "nyckelgenereringen är färdig (%d sekunder)\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 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:2943
+#: scd/app-openpgp.c:2969
 #, 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:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 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:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
diff --git a/po/tr.po b/po/tr.po
index 7eb3bec09..1c2d01575 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.10rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+0200\n"
 "PO-Revision-Date: 2008-12-14 23:25+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish\n"
@@ -92,15 +92,15 @@ msgstr "Anahtar Parolası"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1168,176 +1168,181 @@ 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:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 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:83
+#: g10/card-util.c:106
 msgid "This command is only available for version 2 cards\n"
 msgstr "Bu komut sadece 2. sürüm kartlar için kullanılabilir\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 msgid "Reset Code not or not anymore available\n"
 msgstr "Sıfırlama kodu ya yok ya da kullanım dışı\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[belirtilmedi]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "erkek"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "dişi"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "belirtilmemiş"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "zorlanmadı"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "zorlandı"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Hata: Çift boşluğa izin verilmez.\n"
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Kart sahibinin soyadı: "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Kart sahibinin adı: "
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, 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:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "genel anahtarın alınacağı URL: "
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, 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:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 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:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "`%s' yazılırken hata: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Oturum açma verisi (hesap adı): "
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, 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:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, 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:927
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Hata: yanıt geçersiz.\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA parmak izi: "
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hata: biçimli parmakizi geçersiz\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "anahtar işlemi mümkün değil: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, 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:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 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:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1348,124 +1353,124 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 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:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 msgid "unknown key protection algorithm\n"
 msgstr "bilinmeyen anahtar koruma algoritması\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 msgid "secret parts of key are not available\n"
 msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "bunu gösterir"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 msgid "list all available data"
 msgstr "tüm kullanılabilir veriyi listeler"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr "kart sahibinin ismini değiştirir"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr "anahtarın alınacağı URL değiştirilir"
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr "kart URL'sinde belirtilmiş anahtarı alır"
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr "oturum açma ismini değiştirir"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 msgid "change the language preferences"
 msgstr "dil tercihlerini değiştirir"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr "kart sahibinin cinsiyetini değiştirir"
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 msgid "change a CA fingerprint"
 msgstr "bir CA parmakizini değiştirir"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr "imza zorlama PIN'i bayrağını değiştirir"
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 msgid "generate new keys"
 msgstr "yeni anahtarlar üretir"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr "PIN'i değiştirme veya engelleme menüsü"
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr "PIN'i doğrular ve tüm veriyi listeler"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr "Bir Sıfırlama Kodu kullanarak PIN'in engelini kaldır"
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 msgid "Admin-only command\n"
 msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
@@ -1478,13 +1483,13 @@ msgstr "--output seçeneği bu komutla çalışmaz\n"
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4791,135 +4796,135 @@ msgstr "iptal edildi"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 msgid "key not found on keyserver\n"
 msgstr "anahtar, anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "%2$s sunucusunda %1$s içindeki isimler aranıyor\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "%s içindeki isimler aranıyor\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 msgid "no keyserver action!\n"
 msgstr "bir anahtar sunucusu eylemi yok!\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr "anahtar sunucusu VERSION göndermiyor\n"
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n"
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s  %d sürümü eylemciyi desteklemiyor\n"
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 msgid "keyserver timed out\n"
 msgstr "anahtar sunucusu zamanaşımına uğradı\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 msgid "keyserver internal error\n"
 msgstr "anahtar sunucusu iç hatası\n"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "UYARI: Betimleyici %s çözümlenemiyor\n"
@@ -6580,19 +6585,19 @@ msgstr ""
 "Sözdizimi: kbxutil [seçenekler] [dosyalar]\n"
 "Anahtar kutusu verisini listeler, ithal ve ihraç eder\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, 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-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, 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-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
@@ -6641,79 +6646,79 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, 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:1104
+#: scd/app-openpgp.c:1129
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "genel anahtar okuması başarısız: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr "yanıt genel anahtar verisi içermiyor\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr "yanıt RSA modülü içermiyor\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "%s olarak öntanımlı PIN kullanılamadı: %s - öntanımlı kullanımı iptal "
 "ediliyor\n"
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, 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:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 msgid "||Please enter the PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, 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:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, 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:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6721,114 +6726,114 @@ msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr ""
 "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz%%0A[kalan deneme: %"
 "d]"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 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:1990
+#: scd/app-openpgp.c:2016
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Sıfırlama Kodu çok kısa; asgari uzunluk: %d\n"
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr "|YSK|Yeni Sıfırlama Kodu"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr "|YYP|Yeni Yönetici PIN'i"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 msgid "error reading fingerprint DO\n"
 msgstr "parmakizi DO okunurken hata\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr "mevcut anahtar konulacak\n"
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr "oluşturum zaman damgası kayıp\n"
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, 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:2618
+#: scd/app-openpgp.c:2644
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 msgid "generating key failed\n"
 msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 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:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr "karttaki parmak izi istenenle eşleşmiyor\n"
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kart %s özet algoritmasını desteklemiyor\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 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:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a71bb7a60..43e68409b 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: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+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"
@@ -98,15 +98,15 @@ msgstr "错误的密码"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1193,178 +1193,183 @@ msgstr "找不到有效的 OpenPGP 数据。\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:83
+#: g10/card-util.c:106
 #, fuzzy
 msgid "This command is only available for version 2 cards\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "您的选择？ "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[未设定]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "未定义"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "可选"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "必须"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目前只允许使用 ASCII 字符。\n"
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：不能使用字符“<”。\n"
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "卡持有人的姓："
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "卡持有人的名："
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "获取公钥的 URL："
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 
-#: g10/card-util.c:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "写入钥匙环‘%s’时出错： %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "登录数据(帐号名)："
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "个人 DO 数据："
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "首选语言："
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：首选项字符串长度无效。\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：首选项字符串里有无效字符。\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA 指纹："
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "针对密钥的操作无法实现：%s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1375,124 +1380,124 @@ msgstr ""
 "  PIN = ‘%s’    管理员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/card-util.c:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签名密钥\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 msgid "unknown key protection algorithm\n"
 msgstr "不支持的密钥保护算法\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 msgid "secret parts of key are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "显示这份在线说明"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr "更改卡持有人的姓名"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr "更改获取密钥的 URL"
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 msgid "change the language preferences"
 msgstr "更改首选语言首选"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr "更改卡持有人的性别"
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr "设定 PIN 签名是否必须"
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "命令> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr "允许使用管理员命令\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
@@ -1505,13 +1510,13 @@ msgstr "--output 在这个命令中不起作用\n"
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4709,135 +4714,135 @@ msgstr "已禁用"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥“%s”\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 msgid "key not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "下载密钥 %s，从 %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "在 %s 服务器 %s 上搜索名字\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "在 %s 上搜索名字\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "将密钥‘%s’上传到 %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作！\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "这一编译版本不支持外部调用公钥服务器\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "没有处理‘%s’公钥服务器的程序\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 不支持对版本 %d 的处理\n"
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 msgid "keyserver timed out\n"
 msgstr "公钥服务器超时\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 msgid "keyserver internal error\n"
 msgstr "公钥服务器内部错误\n"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误：%s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法获取 URI %s：%s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "不能解析 URI %s\n"
@@ -6454,19 +6459,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
@@ -6515,191 +6520,191 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "无法存储创建日期：%s\n"
 
-#: scd/app-openpgp.c:1104
+#: scd/app-openpgp.c:1129
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, 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:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管理员 PIN"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr "新的 PIN"
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "无法存储密钥：%s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr "请稍候，正在生成密钥……\n"
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "密钥已生成(耗时 %d 秒)\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡不支持散列算法 %s\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 095ca6c63..8dfc372f8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.10rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-06-08 09:58+0200\n"
+"POT-Creation-Date: 2009-06-17 11:55+0200\n"
 "PO-Revision-Date: 2008-12-10 22:48+0800\n"
 "Last-Translator: Jedi Lin <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -94,15 +94,15 @@ msgstr "密語"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
-#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1079
+#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
+#: g10/tdbio.c:547 jnlib/dotlock.c:310
 #, 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:776
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
@@ -1144,176 +1144,181 @@ msgstr "警告: 找到無效的標記資料\n"
 msgid "not human readable"
 msgstr "不是人類能讀得懂的"
 
-#: g10/card-util.c:62 g10/card-util.c:360
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 
-#: g10/card-util.c:67
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
-#: g10/card-util.c:83
+#: g10/card-util.c:106
 msgid "This command is only available for version 2 cards\n"
 msgstr "祇有第二版卡片纔能用這個指令\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1984
+#: g10/card-util.c:108 scd/app-openpgp.c:2010
 msgid "Reset Code not or not anymore available\n"
 msgstr "(再也) 沒有重設碼\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
+#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "你要選哪一個? "
 
-#: g10/card-util.c:258 g10/card-util.c:308
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:498
+#: g10/card-util.c:509
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "未特定"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "不強迫使用"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:617
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
 
-#: g10/card-util.c:619
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: 不能使用 \"<\" 字符.\n"
 
-#: g10/card-util.c:621
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:638
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "卡片持有者的姓氏: "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "卡片持有者的名字: "
 
-#: g10/card-util.c:658
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "取回公鑰的 URL: "
 
-#: g10/card-util.c:687
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:783 tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "配置足夠的記憶體時出錯: %s\n"
 
-#: g10/card-util.c:795 g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時出錯: %s\n"
 
-#: g10/card-util.c:822
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "寫入 %s 時出錯: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "登入資料 (帳號名稱): "
 
-#: g10/card-util.c:832
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "私人的 DO 資料: "
 
-#: g10/card-util.c:877
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:927
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "介面語言偏好設定: "
 
-#: g10/card-util.c:935
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 無效的偏好設定字串長度\n"
 
-#: g10/card-util.c:944
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
 
-#: g10/card-util.c:965
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性別 ((M)男性, (F)女性或留空): "
 
-#: g10/card-util.c:979
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:1000
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:1023
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 無效的格式化指紋.\n"
 
-#: g10/card-util.c:1071
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "不可能進行金鑰操作: %s\n"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "這不是 OpenPGP 卡片"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1160
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得現用金鑰資訊時出錯: %s\n"
 
-#: g10/card-util.c:1165
+#: g10/card-util.c:1247
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1185 g10/card-util.c:1194
+#: g10/card-util.c:1267 g10/card-util.c:1276
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1288
 msgid "Replace existing keys? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1215
+#: g10/card-util.c:1297
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1324,124 +1329,124 @@ msgstr ""
 "   PIN = `%s'     管理者 PIN = `%s'\n"
 "你應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1249
+#: g10/card-util.c:1331
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇你要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1251 g10/card-util.c:1328
+#: g10/card-util.c:1333 g10/card-util.c:1410
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1252 g10/card-util.c:1330
+#: g10/card-util.c:1334 g10/card-util.c:1412
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332
+#: g10/card-util.c:1335 g10/card-util.c:1414
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1407
 msgid "Please select where to store the key:\n"
 msgstr "請選擇要把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1360
+#: g10/card-util.c:1442
 msgid "unknown key protection algorithm\n"
 msgstr "未知的金鑰保護演算法\n"
 
-#: g10/card-util.c:1365
+#: g10/card-util.c:1447
 msgid "secret parts of key are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/card-util.c:1370
+#: g10/card-util.c:1452
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放在卡片上了\n"
 
-#: g10/card-util.c:1439 g10/keyedit.c:1380
+#: g10/card-util.c:1521 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "離開這個選單"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1523
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1383
+#: g10/card-util.c:1524 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:1444
+#: g10/card-util.c:1526
 msgid "list all available data"
 msgstr "列出所有可用的資料"
 
-#: g10/card-util.c:1447
+#: g10/card-util.c:1529
 msgid "change card holder's name"
 msgstr "變更卡片持有人的名字"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1530
 msgid "change URL to retrieve key"
 msgstr "變更取回金鑰的 URL"
 
-#: g10/card-util.c:1449
+#: g10/card-util.c:1531
 msgid "fetch the key specified in the card URL"
 msgstr "從卡片 URL 取回指定的金鑰"
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1532
 msgid "change the login name"
 msgstr "變更登入名稱"
 
-#: g10/card-util.c:1451
+#: g10/card-util.c:1533
 msgid "change the language preferences"
 msgstr "變更介面語言偏好設定"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1534
 msgid "change card holder's sex"
 msgstr "變更卡片持有者的性別"
 
-#: g10/card-util.c:1453
+#: g10/card-util.c:1535
 msgid "change a CA fingerprint"
 msgstr "變更某個憑證中心 (CA) 的指紋"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1536
 msgid "toggle the signature force PIN flag"
 msgstr "切換簽章是否強制使用 PIN 的旗標"
 
-#: g10/card-util.c:1455
+#: g10/card-util.c:1537
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:1456
+#: g10/card-util.c:1538
 msgid "menu to change or unblock the PIN"
 msgstr "變更或解凍 PIN 的選單"
 
-#: g10/card-util.c:1457
+#: g10/card-util.c:1539
 msgid "verify the PIN and list all data"
 msgstr "驗證 PIN 並列出所有的資料"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1540
 msgid "unblock the PIN using a Reset Code"
 msgstr "用重設碼來解凍 PIN"
 
-#: g10/card-util.c:1580 g10/keyedit.c:1654
+#: g10/card-util.c:1663 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "指令> "
 
-#: g10/card-util.c:1623
+#: g10/card-util.c:1706
 msgid "Admin-only command\n"
 msgstr "限管理者使用的指令\n"
 
-#: g10/card-util.c:1654
+#: g10/card-util.c:1737
 msgid "Admin commands are allowed\n"
 msgstr "允許使用管理者指令\n"
 
-#: g10/card-util.c:1656
+#: g10/card-util.c:1739
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1742 g10/keyedit.c:2277
+#: g10/card-util.c:1832 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
@@ -1454,13 +1459,13 @@ msgstr "--output 在這個指令中沒有作用\n"
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1734
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "找不到金鑰 \"%s\": %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1748
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -4656,135 +4661,135 @@ msgstr "已停用"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1452
+#: g10/keyserver.c:828 g10/keyserver.c:1455
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
 
-#: g10/keyserver.c:926
+#: g10/keyserver.c:929
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 
-#: g10/keyserver.c:928
+#: g10/keyserver.c:931
 msgid "key not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰\n"
 
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1174
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1175
+#: g10/keyserver.c:1178
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "正在從 %s 伺服器 %s 搜尋名字\n"
 
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "正在從 %s 搜尋名字\n"
 
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1358
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1359
+#: g10/keyserver.c:1362
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "遞送金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1402
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1412 g10/keyserver.c:1508
+#: g10/keyserver.c:1415 g10/keyserver.c:1511
 msgid "no keyserver action!\n"
 msgstr "沒有金鑰伺服器動作!\n"
 
-#: g10/keyserver.c:1460
+#: g10/keyserver.c:1463
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告: 金鑰伺服器經手程式係來自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1472
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1531 g10/keyserver.c:2060
+#: g10/keyserver.c:1534 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1540
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "本版並不支援外部金鑰伺服器叫用\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1552
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "沒有 `%s' 金鑰伺服器架構的經手程式\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1557
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "`%s' 動作在 `%s' 金鑰伺服器架構中未支援\n"
 
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1565
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 並不支援第 %d 版經手程式\n"
 
-#: g10/keyserver.c:1569
+#: g10/keyserver.c:1572
 msgid "keyserver timed out\n"
 msgstr "金鑰伺服器逾時\n"
 
-#: g10/keyserver.c:1574
+#: g10/keyserver.c:1577
 msgid "keyserver internal error\n"
 msgstr "金鑰伺服器內部錯誤\n"
 
-#: g10/keyserver.c:1583
+#: g10/keyserver.c:1586
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "金鑰伺服器通訊錯誤: %s\n"
 
-#: g10/keyserver.c:1608 g10/keyserver.c:1642
+#: g10/keyserver.c:1611 g10/keyserver.c:1645
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1904
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1926
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "更新 1 份金鑰中 (從 %s )\n"
 
-#: g10/keyserver.c:1925
+#: g10/keyserver.c:1928
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "更新 %d 份金鑰中 (從 %s )\n"
 
-#: g10/keyserver.c:1981
+#: g10/keyserver.c:1984
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告: 無法抓取 URI %s: %s\n"
 
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:1990
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "警告: 無法剖析 URI %s\n"
@@ -6394,19 +6399,19 @@ msgstr ""
 "語法: kbxutil [選項] [檔案]\n"
 "列出, 匯出, 匯入金鑰鑰匙盒資料\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2492
+#: scd/app-nks.c:712 scd/app-openpgp.c:2518
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2504
+#: scd/app-nks.c:720 scd/app-openpgp.c:2530
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
-#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
-#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
+#: scd/app-nks.c:800 scd/app-openpgp.c:1522 scd/app-openpgp.c:1541
+#: scd/app-openpgp.c:1714 scd/app-openpgp.c:1731 scd/app-openpgp.c:1975
+#: scd/app-openpgp.c:2020 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "收回 PIN 時傳回錯誤: %s\n"
@@ -6455,189 +6460,189 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2053 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的 PIN 時出錯: %s\n"
 
-#: scd/app-openpgp.c:669
+#: scd/app-openpgp.c:691
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: scd/app-openpgp.c:682
+#: scd/app-openpgp.c:704
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生日期失敗: %s\n"
 
-#: scd/app-openpgp.c:1104
+#: scd/app-openpgp.c:1129
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
+#: scd/app-openpgp.c:1137 scd/app-openpgp.c:2753
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:1145 scd/app-openpgp.c:2761
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:1154 scd/app-openpgp.c:2771
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
-#: scd/app-openpgp.c:1448
+#: scd/app-openpgp.c:1474
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "以預設 PIN 做為 %s\n"
 
-#: scd/app-openpgp.c:1455
+#: scd/app-openpgp.c:1481
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "使用預設 PIN 做為 %s 失敗: %s - 正在停用之後的預設使用\n"
 
-#: scd/app-openpgp.c:1470
+#: scd/app-openpgp.c:1496
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
+#: scd/app-openpgp.c:1507 scd/app-openpgp.c:1969
 msgid "||Please enter the PIN"
 msgstr "||請輸入 PIN"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1548 scd/app-openpgp.c:1738 scd/app-openpgp.c:1982
 #, 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:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
-#: scd/app-openpgp.c:3044
+#: scd/app-openpgp.c:1561 scd/app-openpgp.c:1612 scd/app-openpgp.c:1750
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV%d 失敗: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
+#: scd/app-openpgp.c:1641 scd/app-openpgp.c:2001 scd/app-openpgp.c:3333
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:3342
 msgid "card is permanently locked!\n"
 msgstr "卡片永久鎖定了!!\n"
 
-#: scd/app-openpgp.c:1628
+#: scd/app-openpgp.c:1654
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d 管理者 PIN 試圖在卡片永久鎖定前遺留下來\n"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1661
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "|A|請在讀卡機鍵盤上輸入管理者 PIN%%0A[剩餘嘗試次數: %d]"
 
-#: scd/app-openpgp.c:1639
+#: scd/app-openpgp.c:1665
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||請輸入 PIN"
 
-#: scd/app-openpgp.c:1660
+#: scd/app-openpgp.c:1686
 msgid "access to admin commands is not configured\n"
 msgstr "管理者指令存取權限尚未組態\n"
 
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2016
 msgid "||Please enter the Reset Code for the card"
 msgstr "||請輸入卡片的重設碼"
 
-#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
+#: scd/app-openpgp.c:2026 scd/app-openpgp.c:2078
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "重設碼太短; 長度最少要有 %d\n"
 
-#: scd/app-openpgp.c:2022
+#: scd/app-openpgp.c:2048
 msgid "|RN|New Reset Code"
 msgstr "|RN|新增重設碼"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新增管理者 PIN"
 
-#: scd/app-openpgp.c:2023
+#: scd/app-openpgp.c:2049
 msgid "|N|New PIN"
 msgstr "|N|新增 PIN"
 
-#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
+#: scd/app-openpgp.c:2158 scd/app-openpgp.c:2839
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
+#: scd/app-openpgp.c:2164 scd/app-openpgp.c:2846
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2174
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: scd/app-openpgp.c:2152
+#: scd/app-openpgp.c:2178
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被取代\n"
 
-#: scd/app-openpgp.c:2154
+#: scd/app-openpgp.c:2180
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: scd/app-openpgp.c:2480
+#: scd/app-openpgp.c:2506
 msgid "creation timestamp missing\n"
 msgstr "缺漏創生時間戳印\n"
 
-#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
+#: scd/app-openpgp.c:2540 scd/app-openpgp.c:2548
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
 
-#: scd/app-openpgp.c:2618
+#: scd/app-openpgp.c:2644
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: scd/app-openpgp.c:2704
+#: scd/app-openpgp.c:2730
 msgid "please wait while key is being generated ...\n"
 msgstr "正在產生金鑰中, 請稍候 ...\n"
 
-#: scd/app-openpgp.c:2717
+#: scd/app-openpgp.c:2743
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: scd/app-openpgp.c:2720
+#: scd/app-openpgp.c:2746
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "金鑰產生完畢 (%d 秒)\n"
 
-#: scd/app-openpgp.c:2778
+#: scd/app-openpgp.c:2804
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2828
+#: scd/app-openpgp.c:2854
 msgid "fingerprint on card does not match requested one\n"
 msgstr "卡片上的指紋與所要求的那個並不吻合\n"
 
-#: scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:2969
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡片不支援 %s 摘要演算法\n"
 
-#: scd/app-openpgp.c:3019
+#: scd/app-openpgp.c:3045
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:3321
+#: scd/app-openpgp.c:3347
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
 
-#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:3572 scd/app-openpgp.c:3583
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
author	Werner Koch <[email protected]>	2009-06-17 11:18:26 +0000
committer	Werner Koch <[email protected]>	2009-06-17 11:18:26 +0000
commit	c998dd12a2dd0bd219ce0a68bdd9fcf82bb1c70e (patch)
tree	11be2c0a6cb5cd0fee8ff31436d72f56074fda40
parent	Use cancel button in confirmation only if requested. (diff)
download	gnupg-c998dd12a2dd0bd219ce0a68bdd9fcf82bb1c70e.tar.gz gnupg-c998dd12a2dd0bd219ce0a68bdd9fcf82bb1c70e.zip