* dynload.h: Always use it for _WIN32.

* LINGUAS: Better don't have comments in this file.

* mk-w32-dist: Use utf-8 encoding for all MO files.

* simple-gettext.c: Removed windows.h.
(get_string): On the fly translation from utf-8 to active
character set.

* strgutil.c (load_libiconv) [_WIN32]: new.
(set_native_charset) [_WIN32]: Call it here and autodetect the
used code page.
(native_to_utf8, utf8_to_native): Reverted arguments for
iconv_open.
(handle_iconv_error): Made this function match iconv_open argumnet
ordering.
(utf8_to_native): Disable all quoting for DELIM == -1.

36 files changed, 5133 insertions, 5410 deletions

diff --git a/include/ChangeLog b/include/ChangeLog
index c1c3df077..3b693681f 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-27  Werner Koch  <[email protected]>
+
+	* dynload.h: Always use it for _WIN32.
+
 2004-10-21  Werner Koch  <[email protected]>
 
 	* util.h [!HAVE_VASPRINTF]: Removed prototype.
diff --git a/include/dynload.h b/include/dynload.h
index 36dbb8ce9..21e30131e 100644
--- a/include/dynload.h
+++ b/include/dynload.h
@@ -20,7 +20,7 @@
 
 #ifndef GNUPG_DYNLOAD_H
 #define GNUPG_DYNLOAD_H
-#ifdef ENABLE_CARD_SUPPORT
+#if defined (ENABLE_CARD_SUPPORT) || defined(_WIN32)
 #ifndef _WIN32
 #include <dlfcn.h>
 #else
@@ -68,6 +68,6 @@ dlclose (void * hd)
     }
   return -1;
 }  
-#endif /*__MINGW32__*/
-#endif /*ENABLE_CARD_SUPPORT*/
+#endif /*_WIN32*/
+#endif /*ENABLE_CARD_SUPPORT||_WIN32*/
 #endif /*GNUPG_DYNLOAD_H*/
diff --git a/po/ChangeLog b/po/ChangeLog
index 5be754668..5270ca926 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-27  Werner Koch  <[email protected]>
+
+	* LINGUAS: Better don't have comments in this file.
+
 2004-10-15  Werner Koch  <[email protected]>
 
 	* POTFILES.in: Updated.
diff --git a/po/LINGUAS b/po/LINGUAS
index 220654604..a5aed4abf 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,4 +1,3 @@
-# Set of available languages.
 en@quot en@boldquot
 be
 ca cs
diff --git a/po/be.po b/po/be.po
index d434a22d1..62f0087ad 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: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+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"
@@ -34,8 +34,8 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -124,18 +124,18 @@ msgstr ""
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -161,44 +161,39 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 msgid "reading the key failed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -290,7 +285,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -355,85 +350,81 @@ msgstr ""
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -441,192 +432,192 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit [выйсьці]"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "даведка (help)"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Даведка адсутнічае"
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr ""
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr ""
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "name"
 msgstr ""
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 msgid "login"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 msgid "cafpr"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 msgid "forcesig"
 msgstr ""
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "агульная памылка"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr ""
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr ""
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Загад> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
@@ -653,7 +644,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1212,382 +1203,382 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -4310,55 +4301,55 @@ msgstr ""
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4369,40 +4360,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Увядзіце пароль\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "пароль занадта доўгі\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr ""
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Увядзіце пароль: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4412,17 +4403,17 @@ msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Паўтарыце пароль: "
 
diff --git a/po/ca.po b/po/ca.po
index 73a0795f3..6219cfbda 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4rc\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2003-12-05 19:15+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -55,8 +55,8 @@ msgstr "no s'ha pogut generar un prim amb menys de %d bits\n"
 msgid "no entropy gathering module detected\n"
 msgstr "no s'ha trobat cap m�dul d'acumulaci� d'entropia\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -159,18 +159,18 @@ msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "no s'ha pogut reconstruir la mem�ria cau de l'anell: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
@@ -196,45 +196,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no s'han trobat dades OpenPGP v�lides.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "error en la creaci� de la contrasenya: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, 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"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -333,7 +328,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "no es pot fet aix� en mode desat�s\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -406,87 +401,83 @@ msgstr "no hi ha cap clau p�blica corresponent: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de �%s�: %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncies actualitzades"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, 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:652
+#: g10/card-util.c:658
 #, 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:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital �s inv�lida\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital �s inv�lida\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generaci� de claus ha fallat: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP v�lides.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, 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:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -494,203 +485,203 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nom�s xifrar)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "La selecci� �s inv�lida.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la ra� de la revocaci�:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "l'algorisme de protecci� �s desconegut\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, 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:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja �s present\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "ix"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ix del men�"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "ajuda"
 
 # �pantalla� o �ajuda�?  ivb
 # �ajuda�, evidentment. jm
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "llista"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau �s disponible en: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "depura"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confian�a"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "error general"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
 # Dest�s? ivb
 # Desat�s, s�. jm
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "no es pot fet aix� en mode desat�s\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no �s v�lida (proveu �help�)\n"
 
@@ -718,7 +709,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Introdu�u el nom d'usuari: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1321,375 +1312,375 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions �%s�\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic �%s�\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades �%s�\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions �%s�: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de �%s�\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no �s per a �s normal!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "la extensi� de xifrat �%s� no s'ha carregat per tindre permissos "
 "insegurs\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no �s un joc de car�cters v�lid\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr ""
 "no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanci� no v�lides\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "opcions d'importaci� no v�lides\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanci� no v�lides\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importaci� no v�lides\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "AV�S: el programa podria crear un fitxer core!\n"
 
 # FIXME: prefer�ncia? jm
 # Ho discut�rem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AV�S: %s t� prefer�ncia sobre %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no �s perm�s amb %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no t� sentit amb %s!\n"
 
 # clares -> en clar?  ivb
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nom�s podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
 "habilitat.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no �s v�lid\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no �s v�lid\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no �s v�lid\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificaci� seleccionat no �s v�lid\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no �s gens recomanable\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K �s inv�lid; ha de ser 0, 1 o 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "les prefer�ncies per defecte s�n inv�lides\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "les prefer�ncies personals de xifrat s�n inv�lides\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "les prefer�ncies personals de digest s�n inv�lides\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "les prefer�ncies personals de compressi� s�n inv�lides\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "no podeu usar l'algorisme de xifratge �%s� mentre esteu en mode %s\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de compressi� %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AV�S: s'han donat destinataris (-r) sense usar xifratge de clau p�blica\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepci� des del servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportaci� de la clau ha fallat: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersi� �s inv�lid �%s�\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1697,23 +1688,23 @@ msgstr ""
 "un nom de notaci� nom�s pot tenir car�cters imprimibles o espais i "
 "acabar amb el signe �=�\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notaci� d'usuari no pot contenir el car�cter �@�\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci� no pot utilitzar cap car�cter de control\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de pol�tica de certificaci� donada no �s v�lida\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de pol�tica de signatura donada no �s v�lida\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de pol�tica de signatura donada no �s v�lida\n"
@@ -4793,51 +4784,51 @@ msgstr ""
 "AV�S: la clau de sessi� pot estar xifrada sim�tricament de forma "
 "insegura\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d t� el bit cr�tic activat\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent no est� disponible en aquesta sessi�\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "no es pot establir el pid del client per l'agent\n"
 
 # llija/llegisca/llegesca.  ivb
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "no es pot fer que el servidor llegesca el DF per a l'agent\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "no es pot fer que el servidor escriga el DF per a l'agent\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO �s malformada\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versi� %d del protocol de gpg-agent no est� suportada\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb �%s�: %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "hi ha un problema de comunicaci� amb el gpg-agent\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "hi ha un problema amb l'agent: es deshabilitar� el seu �s\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -4853,7 +4844,7 @@ msgstr " (ID de la clau principal %08lX)"
 # Se't passava l'argument �*�.  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gr�cies! Aquest msgstr ha quedat curi�s :) jm
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4864,40 +4855,40 @@ msgstr ""
 "�%2$.*1$s�\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Repetiu la contrasenya\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Introdu�u la contrasenya\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "la contrasenya �s massa llarga\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "la resposta de l'agent �s inv�lida\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "s'ha cancel�lat per l'usuari\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "no es pot demanar la contrasenya en mode desat�s\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Introdu�u la contrasenya: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4907,17 +4898,17 @@ msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Repetiu la contrasenya: "
 
diff --git a/po/cs.po b/po/cs.po
index 70b26a40e..ee897d586 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2003-12-07 16:20+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -32,8 +32,8 @@ msgstr "nemohu vygenerovat prvo��slo s m�n� ne� %d bity\n"
 msgid "no entropy gathering module detected\n"
 msgstr "nebyl detekov�n ��dn� modul pro z�sk�n� entropie\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -132,18 +132,18 @@ msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
@@ -169,45 +169,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -302,7 +297,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -371,86 +366,82 @@ msgstr "neexistuje odpov�daj�c� ve�ejn� kl��: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizovat p�edvolby"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatn� znak v �et�zci s p�edvolbami\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatn� znak v �et�zci s p�edvolbami\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatn� fingerprint\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vypsat fingerprint"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatn� fingerprint\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba p�i z�pisu do souboru tajn�ch kl��� `%s': %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -458,199 +449,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m vyberte d�vod revokace:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�m� kompresn� algoritmus\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "p�esko�eno: tajn� kl�� je u� v datab�zi\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "ukon�it"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "u"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Kl�� k dispozici na: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "zm�nit dobu platnosti"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vypsat fingerprint"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "obecn� chyba"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
@@ -677,7 +668,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1253,372 +1244,372 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra \"%s\" nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
 "bezpe�n�\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nen� platn� znakov� sada\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nelze pou��t URI serveru kl��� - chyba anal�zy URI\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et pouze odd�len� podpisy nebo podpisy �iteln� "
 "jako text\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�du --pgp2 nelze sou�asn� �ifrovat a podepisovat\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrov�n� zpr�v v m�du --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� b�t v rozmez� od 1 do 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatn� implicitn� �rove� certifikace (default-cert-level); mus� b�t 0, 1, "
 "2 nebo 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatn� minim�ln� �rove� certifikace (min-cert-level); mus� b�t 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razn� nedoporu�ov�n\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� b�t 0, 1 nebo 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "pou�it� �ifrovac�ho algoritmu \"%s\" v m�du %s dovoleno\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "pou�it� hashovac�ho algoritmu \"%s\" v m�du %s dovoleno\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pou�it� komprima�n�ho algoritmu \"%s\" v m�du %s dovoleno\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROV�N�: specifikov�n adres�t (-r) bez pou�it� �ifrov�n� s ve�ejn�m kl��em\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrov�n� selhalo: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u�ivatele"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u�ivatele"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u�ivatele] [soubor s kl��i (keyring)]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1626,23 +1617,23 @@ msgstr ""
 "symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
 "a mus� kon�it znakem '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
@@ -4619,55 +4610,55 @@ msgstr "nemohu pracovat s algoritmem ve�ejn�ho kl��e %d\n"
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "nemohu nastavit PID klienta pro gpg-agenta\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "nelze z�skat server read file descriptor pro agenta r\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "nezle z�skat server write file descriptor pro agenta\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�m v komunikaci s gpg-agentem\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID kl��e %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4678,40 +4669,40 @@ msgstr ""
 "\"%.*s\"\n"
 "Kl�� o d�lce %u bit�, typ %s, ID %08lX, vytvo�en� %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Opakovat heslo\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Vlo�it heslo\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "heslo je p��li� dlouh�\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "neplatn� reakce od agenta\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�m s agentem: agent vrac� 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "v d�vkov�m re�imu se nemohu pt�t na heslo\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4721,17 +4712,17 @@ msgstr ""
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
 "u�ivatele: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�lka %u bit�, typ %s, kl�� %08lX, vytvo�en� %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
diff --git a/po/da.po b/po/da.po
index 39356b623..50654ce8d 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: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+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"
@@ -35,8 +35,8 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -134,18 +134,18 @@ msgstr "kunne ikke initialisere TillidsDB: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
@@ -171,46 +171,41 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -303,7 +298,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -371,88 +366,84 @@ msgstr "skriver offentligt certifikat til '%s'\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingeraftryk:"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, 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:870
+#: g10/card-util.c:878
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -460,198 +451,198 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, 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:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "afslut"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "a"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "hj�lp"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "vis"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "aflus"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "sl�til"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign�r"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 msgid "forcesig"
 msgstr ""
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "generel fejl"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "kodeord"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr ""
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
@@ -679,7 +670,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1242,400 +1233,400 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -4439,55 +4430,55 @@ msgstr ""
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4495,42 +4486,42 @@ msgid ""
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr ""
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4539,17 +4530,17 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
diff --git a/po/de.po b/po/de.po
index a7f2744b6..eb90dd768 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2004-10-05 10:11+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -32,8 +32,8 @@ msgstr "Eine Primzahl mit weniger als %d Bits kann nicht erzeugt werden\n"
 msgid "no entropy gathering module detected\n"
 msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -135,18 +135,18 @@ msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "Schl�sselbund-Cache konnte nicht neu erzeugt werden: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
@@ -172,45 +172,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -305,7 +300,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -374,88 +369,84 @@ msgstr "kein zugeh�riger �ffentlicher Schl�ssel: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "ge�nderte Voreinstellungen"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ung�ltiges Feld in der Voreinstellungszeichenkette\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ung�ltiges Feld in der Voreinstellungszeichenkette\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ung�ltiger Fingerabdruck\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingerabdruck:"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ung�ltiger Fingerabdruck\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -463,199 +454,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bitte w�hlen Sie, welche Art von Schl�ssel Sie m�chten:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Grund f�r den Widerruf:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Unbekanntes Schutzverfahren\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "Liste der Schl�ssel"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Schl�ssel erh�ltlich bei: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndern des Verfallsdatums"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "Allgemeiner Fehler"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
@@ -683,7 +674,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1277,376 +1268,376 @@ msgstr "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses (%s) \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "Verschl�sselungserweiterung \"%s\" wurde wegen falscher Rechte nicht "
 "geladen\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ung�ltige Import Option.\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "Ung�ltige Import Option\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ung�ltige Import Option.\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "Ung�ltige Import Option\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nur abgetrennte oder Klartextunterschriften "
 "machen\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nicht gleichzeitig unterschreiben und "
 "verschl�sseln\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus m�ssen Sie Dateien benutzen und k�nnen keine Pipes "
 "verwenden.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschl�ssen einer Botschaft ben�tigt im --pgp2-Modus die IDEA-"
 "Verschl�sselung\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr���er als 0 sein\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr���er als 1 sein\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ung�ltiger \"default-cert-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ung�ltiger \"min-cert-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "ung�ltige Standard Voreinstellungen\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "ung�ltige private Hashvoreinstellungen\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschl�sselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empf�nger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Entschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key User-ID"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key User-ID"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schl�sselexport fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1654,23 +1645,23 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
@@ -4692,56 +4683,56 @@ msgstr ""
 "WARNUNG: M�glicherweise unsicherer symmetrisch verschl�sselter "
 "Sitzungsschl�ssel\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "Client-PID f�r den Agent kann nicht gesetzt werden\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "Server-Lese-Handle f�r den Agent nicht verf�gbar\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "Server-Schreib-Handle f�r den Agent nicht verf�gbar\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterst�tzt\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunikationsproblem mit GPG-Agent\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4752,40 +4743,40 @@ msgstr ""
 "Benutzer: \"%.*s\"\n"
 "%u-bit %s Schl�ssel, ID %s, erzeugt %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Geben Sie die Passphrase nochmal ein\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Geben Sie die Passphrase ein\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "Passphrase ist zu lang\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "Falsche Antwort des Agenten\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Geben Sie die Passphrase ein: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4795,17 +4786,17 @@ msgstr ""
 "Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Geben Sie die Passphrase nochmal ein: "
 
diff --git a/po/el.po b/po/el.po
index 6bc9a7d2b..3c674b81b 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: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+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"
@@ -34,8 +34,8 @@ msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
 msgid "no entropy gathering module detected\n"
 msgstr "��� ����������� ������� �������� ���������\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -136,18 +136,18 @@ msgstr "�������� ������������� ��� TrustDB: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
@@ -173,45 +173,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -306,7 +301,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "�������, ��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -375,86 +370,82 @@ msgstr "������ ��������� ������� ������: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "����������� ��������"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -462,199 +453,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "�����������"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "������ ��������� ���: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "������ ��� ����������� �����"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "������ ������"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "������> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
@@ -681,7 +672,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1261,375 +1252,375 @@ msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1637,23 +1628,23 @@ msgstr ""
 "��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
 "��� �� ����� �� ��� '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -4647,55 +4638,55 @@ msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "�������� ������� ��� pid ��� ������ ��� �� agent\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "�������� ��������� ��� FD ��� �� ���������� ��� ��� agent\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "�������� �������� ��� FD ��� �� ���������� ��� ��� agent\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "�������� ������������ �� �� gpg-agent\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "�������� �� ��� agent - �������������� ��� ������ ��� agent\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (����� ������, ID %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4707,40 +4698,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "����������� �� �����\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "�������������� �� ����� ������\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "�� ������ �������� ��� ��� agent\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "�������� �������� ��� ����� ������ �� ��������� ������\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "�������������� �� ����� ������: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4750,17 +4741,17 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "����������� �� ����� ������: "
 
diff --git a/po/eo.po b/po/eo.po
index 43a678e6f..31a70740c 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: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+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"
@@ -33,8 +33,8 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -132,18 +132,18 @@ msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
@@ -169,45 +169,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -303,7 +298,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -372,86 +367,82 @@ msgstr "skribas publikan �losilon al '%s'\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, 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:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -459,199 +450,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "fini"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "f"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "helpo"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "listo"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "spuri"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "en"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsub"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fsp"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "�enerala eraro"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "pasf"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
@@ -679,7 +670,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1242,372 +1233,372 @@ msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key uzantidentigilo"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key uzantidentigilo"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1616,24 +1607,24 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -4615,55 +4606,55 @@ msgstr "ne povas trakti publik�losilan metodon %d\n"
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "ne povas agordi kliento-PID por la agento\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "ne povas akiri lego-FD de servilo por la agento\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "ne povas akiri skribo-FD de servilo por la agento\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "komunikproblemo kun gpg-agent\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problemo kun agento - mal�altas uzadon de agento\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4674,40 +4665,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "nevalida respondo de agento\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4717,17 +4708,17 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
diff --git a/po/es.po b/po/es.po
index c3ff19b1c..1da9b4d54 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2004-10-12 19:27+0200\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -37,8 +37,8 @@ msgstr "no se puede generar un primo con menos de %d bits\n"
 msgid "no entropy gathering module detected\n"
 msgstr "no se ha detectado m�dulo acumulador de entrop�a\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -145,18 +145,18 @@ msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
@@ -182,45 +182,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -315,7 +310,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "lo siento, no puede hacerse en modo de proceso por lotes\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -384,88 +379,84 @@ msgstr "no existe la clave p�blica correspondiente: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inv�lido en cadena de preferencias\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inv�lido en cadena de preferencias\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: huella dactilar no v�lida\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Huella dactilar:"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: huella dactilar no v�lida\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "�Firmar de verdad? "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "�Firmar de verdad? "
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -473,199 +464,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija una raz�n para la revocaci�n:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desconocido\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "salir|fin|acabar"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "s"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "ayuda"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "lista"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Clave disponible en: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "depura"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "habcla"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "firmal"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia fecha de caducidad"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia valores de confianza"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "hdac"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revfir"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "Error general"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nuevo par de claves"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "contr"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
@@ -693,7 +684,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1275,355 +1266,355 @@ msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido \"%s\"\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "no se carga el cifrado de ampliaci�n \"%s\" por permisos inseguros\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no es un juego de caracteres v�lido\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URI del servidor de claves\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango 1-255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el cifrado \"%s\" en modo %s\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el resumen \"%s\" en modo %s\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no puede usar la compresi�n \"%s\" en modo %s\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-usuario"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-usuario"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1631,11 +1622,11 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1643,23 +1634,23 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
 "acabar con un '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
@@ -4632,55 +4623,55 @@ msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "no puedo establecer pid para el agente\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "no puedo conseguir el FD de lectura para el agente\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "no puedo conseguir el FD de escritura para el agente\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con el agente gpg\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con el agente - inhabilitando el uso del agente\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr "(ID clave primaria %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4691,40 +4682,40 @@ msgstr ""
 "del usuario: \"%.*s\"\n"
 "%u bits, clave %s, ID %08lX, creada el %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Repita frase contrase�a\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contrase�a\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "frase contrase�a demasiado larga\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "respuesta del agente inv�lida\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "imposible pedir contrase�a en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Introduzca frase contrase�a: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4734,17 +4725,17 @@ msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Repita frase contrase�a: "
 
diff --git a/po/et.po b/po/et.po
index 15f2f4272..b3979a0ab 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: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+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"
@@ -33,8 +33,8 @@ msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
 msgid "no entropy gathering module detected\n"
 msgstr "entroopia kogumise moodul puudub\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -133,18 +133,18 @@ msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
@@ -170,45 +170,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -302,7 +297,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "vabandust, seda ei saa pakettmoodis teha\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -371,86 +366,82 @@ msgstr "vastavat avalikku v�tit pole: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, 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:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -458,199 +449,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, 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:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, 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:1075
+#: g10/card-util.c:1092
 #, 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:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "v�lju"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "v"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "V�tme leiate: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "�ldine viga"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
@@ -677,7 +668,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1246,365 +1237,365 @@ msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key kasutaja-id"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key kasutaja-id"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1612,23 +1603,23 @@ msgstr ""
 "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -4574,55 +4565,55 @@ msgstr ""
 "HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
 "v�ti\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "agendile ei �nnestu seada kliendi pid\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "agendiga suhtlemiseks ei �nnestu saada lugemise FD\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "agendiga suhtlemiseks ei �nnestu saada kirjutamise FD\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise v�tme ID %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4633,40 +4624,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Korrake parooli\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "liiga pikk parool\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "vigane vastus agendilt\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "pakettmoodis ei saa parooli k�sida\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Sisestage parool: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4676,17 +4667,17 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Korrake parooli: "
 
diff --git a/po/fi.po b/po/fi.po
index 076d693ff..a26e861de 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: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+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"
@@ -49,8 +49,8 @@ msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
 msgid "no entropy gathering module detected\n"
 msgstr "entropian keräysmoduulia ei havaittu\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -151,18 +151,18 @@ msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
@@ -188,45 +188,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -322,7 +317,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "valitan, tätä ei voi tehdä eräajossa\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -391,86 +386,82 @@ msgstr "ei vastaavaa julkista avainta: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -478,199 +469,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "lopeta|sulje"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "apua"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "yleinen virhe"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Komento> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
@@ -697,7 +688,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1267,366 +1258,366 @@ msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrlsign-key käyttäjätunnus"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key käyttäjätunnus"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1634,23 +1625,23 @@ msgstr ""
 "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
 "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -4631,55 +4622,55 @@ msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "agentille ei voida asettaa pid:tä\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "palvelin ei lue agentin FD:tä\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "palvelin ei kirjoita agentille FD:tä\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agentin kanssa yhteysongelma\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4690,40 +4681,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Toista salasana\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "salasana on liian pitkä\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "agentin lähettämä vastaus ei kelpaa\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "salasanan kysyminen ei onnistu eräajossa\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Syötä salasana: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4732,17 +4723,17 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Toista salasana: "
 
diff --git a/po/fr.po b/po/fr.po
index 0420590ee..0dea4230d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2004-06-16 20:20+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -40,8 +40,8 @@ msgstr "impossible de g�n�rer un nombre premier avec moins de %d bits\n"
 msgid "no entropy gathering module detected\n"
 msgstr "aucun module de r�cup�ration d'entropie n'a �t� trouv�.\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -144,18 +144,18 @@ msgstr "impossible d'initialiser la base de confiance: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
@@ -181,45 +181,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "erreur pendant la cr�ation du mot de passe: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -314,7 +309,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "d�sol�, impossible de faire cela en mode automatique\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -383,86 +378,82 @@ msgstr "pas de cl� publique correspondante: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "pr�f�rences mises � jour"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Caract�re invalide dans la cha�ne de pr�f�rences\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Caract�re invalide dans la cha�ne de pr�f�rences\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erreur: empreinte invalide\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "afficher l'empreinte"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erreur: empreinte invalide\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s secret `%s': %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -470,200 +461,200 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "La signature a expir� le %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "choisissez la cause de la r�vocation:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algorithme de protection inconnu\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignor�: cl� secr�te d�j� pr�sente\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quitter"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "commandes en conflit\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "lister"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Cl� disponible sur: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "d�boguer"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "activer"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsigner"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "changer la date d'expiration"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "changer la confiance"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
 # g10/keyedit.c:556 ???
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "erreur g�n�rale"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "commandes en conflit\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
@@ -690,7 +681,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1288,378 +1279,378 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration \"%s\" inconnu\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'extension de chiffrement \"%s\" n'a pas �t� charg�e car ses\n"
 "permissions sont peu s�res\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n'est pas une table de caract�res valide\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URI du serveur de cl�s\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature d�tach�e ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activ�.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "�max-cert-depth� doit �tre compris entre 1 et 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de chiffrement \"%s\"\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de hachage \"%s\"\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de compression \"%s\"\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des r�cipients (-r) ont donn�s alors que le chiffrement\n"
 "ne se fait pas par cl� publique\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key utilisateur"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key utilisateur"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1667,23 +1658,23 @@ msgstr ""
 "le nom d'une notation ne doit comporter que des caract�res imprimables\n"
 "ou des espaces, et se terminer par un signe '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
@@ -4687,58 +4678,58 @@ msgstr ""
 "AVERISSEMENT: la cl� de session chiffr�e de mani�re sym�trique est\n"
 "potentiellement non s�re\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "impossible d'obtenir le pid du client pour l'agent\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 "impossible d'obtenir le descripteur de lecture du serveur\n"
 "pour l'agent\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 "impossible d'obtenir le descripteur d'�criture du serveur pour l'agent\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�me de communication avec ssh-agent\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cl� principale %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4750,40 +4741,40 @@ msgstr ""
 "\"%.*s\"\n"
 "cl� %u bits %s, ID %08lX, cr��e %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "R�p�tez le mot de passe\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Entrez le mot de passe\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "mot de passe trop long\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "r�ponse de l'agent invalide\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�me avec l'agent : l'agent renvoie 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "impossible de demander un mot de passe en mode automatique\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4793,17 +4784,17 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n"
 "l'utilisateur: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cl� de %u bits %s, ID %08lX, cr��e le %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "R�p�tez le mot de passe: "
 
diff --git a/po/gl.po b/po/gl.po
index 533c7e3e4..0acc9939d 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: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+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"
@@ -33,8 +33,8 @@ msgstr "non se pode xerar un n�mero primo de menos de %d bits\n"
 msgid "no entropy gathering module detected\n"
 msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -136,18 +136,18 @@ msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
@@ -173,45 +173,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -306,7 +301,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "sent�molo, non se pode facer isto no modo por lotes\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -375,86 +370,82 @@ msgstr "non hai unha chave p�blica correspondente: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -462,199 +453,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, 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:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, 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:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "abandonar"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "s"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "axuda"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "listar"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispo�ible en: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "depurar"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "erro xeral"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
@@ -682,7 +673,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1257,369 +1248,369 @@ msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-de-usuario"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-de-usuario"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1627,23 +1618,23 @@ msgstr ""
 "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -4621,55 +4612,55 @@ msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "non se pode estabrece-lo pid do cliente para o axente\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "non se pode obte-lo FD de lectura do servidor para o axente\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "non se pode obte-lo FD de escritura do servidor para o axente\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con gpg-agent\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema co axente - desactivando o emprego do axente\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4680,40 +4671,40 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Repita o contrasinal\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "contrasinal demasiado longo\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "resposta do axente non v�lida\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Introduza o contrasinal: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4723,17 +4714,17 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Repita o contrasinal: "
 
diff --git a/po/hu.po b/po/hu.po
index 218a3b6b4..9ba99471e 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: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+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"
@@ -33,8 +33,8 @@ msgstr "Nem tudok l�trehozni %d bitesn�l kisebb pr�msz�mot.\n"
 msgid "no entropy gathering module detected\n"
 msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -135,18 +135,18 @@ msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
@@ -172,45 +172,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -304,7 +299,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "Sajn�lom, ezt nem tudom megcsin�lni k�tegelt m�dban!\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -373,86 +368,82 @@ msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenci�k friss�t�se"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, 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:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -460,199 +451,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, 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:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, 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:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, 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:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "kil�p�s|kilepes"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "lej�rat megv�ltoztat�sa"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "�ltal�nos hiba"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
@@ -679,7 +670,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1246,366 +1237,366 @@ msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key felh-azonos�t�"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key felh-azonos�t�"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1613,23 +1604,23 @@ msgstr ""
 "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
 "jellel kell befejez�dj�n.\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
@@ -4601,57 +4592,57 @@ msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "Nem tudom be�ll�tani a kliens pid-et az �gyn�knek.\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "Nem tudom lek�rni a szerver olvas�si �llom�nyle�r�j�t az �gyn�knek.\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "Nem tudom lek�rni a szerver �r�si �llom�nyle�r�j�t az �gyn�knek.\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "Probl�ma van az �gyn�kkel. Letiltom a haszn�lat�t.\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (f� kulcsazonos�t�: %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4663,40 +4654,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Ism�telje meg a jelsz�t!\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "�rja be a jelsz�t!\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "A jelsz� t�l hossz�!\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "�rv�nytelen v�lasz az �gyn�kt�l!\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "Nem tudok jelsz�t bek�rni k�tegelt m�dban!\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "�rja be a jelsz�t: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4707,17 +4698,17 @@ msgstr ""
 "haszn�lat�hoz:\n"
 "\""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Ism�telje meg a jelsz�t: "
 
diff --git a/po/id.po b/po/id.po
index fc2dade37..61675c4dd 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: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+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"
@@ -35,8 +35,8 @@ msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
 msgid "no entropy gathering module detected\n"
 msgstr "modul entropi gathering tidak terdeteksi\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -136,18 +136,18 @@ msgstr "gagal inisialisasi TrustDB: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
@@ -173,45 +173,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -306,7 +301,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "maaf, tidak dapat melakukan hal ini dalam mode batch\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -375,86 +370,82 @@ msgstr "tidak ada kunci publik yang sesuai: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -462,199 +453,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "q|k|keluar"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "bantuan"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "tampilkan"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "Kesalahan umum"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
@@ -681,7 +672,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1250,374 +1241,374 @@ msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1625,23 +1616,23 @@ msgstr ""
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -4613,55 +4604,55 @@ msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "tidak dapat menset pid client untuk agen\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "tidak dapat membuat server membaca FD untuk agen\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "tidak dapat membuat server menulis FD untuk agen\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "masalah komunikasi dengan gpg-agent\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "masalah dengan agen - tiadakan penggunaan agen\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4672,40 +4663,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Ulangi passphrase\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "passphrase terlalu panjang\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "respon tidak valid dari agen\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4715,17 +4706,17 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
diff --git a/po/it.po b/po/it.po
index 350ceb1b8..6cb2a46a8 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: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -33,8 +33,8 @@ msgstr "impossibile generare un numero primo di meno di %d bit\n"
 msgid "no entropy gathering module detected\n"
 msgstr "non � stato trovato il modulo per raccogliere l'entropia\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -137,18 +137,18 @@ msgstr "inizializzazione del trustdb fallita: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
@@ -174,45 +174,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -307,7 +302,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "mi dispiace, non � possibile fare questo in modo batch\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -377,86 +372,82 @@ msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenze aggiornate"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -464,199 +455,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, 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:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Chiave disponibile presso: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "abilita"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia la data di scadenza"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia il valore di fiducia"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "errore generale"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
@@ -683,7 +674,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1261,371 +1252,371 @@ msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
 "permessi insicuri.\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1633,23 +1624,23 @@ msgstr ""
 "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
 "spazi e terminare con un '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -4637,55 +4628,55 @@ msgstr ""
 "ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
 "non sicura\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "impossibile impostare il pid del client dell'agent\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "impossibile ottenere il FD di lettura dell'agent\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "impossibile ottenere il FD di scrittura dell'agent\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "problema di comunicazione con gpg-agent\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con l'agent - uso dell'agent disattivato\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4696,40 +4687,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Ripeti la passphrase\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "passphrase troppo lunga\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "risposta non valida dall'agent\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4739,17 +4730,17 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
diff --git a/po/ja.po b/po/ja.po
index f35af3845..490573730 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2003-12-06 00:44+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -36,8 +36,8 @@ msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
 msgid "no entropy gathering module detected\n"
 msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -136,18 +136,18 @@ msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
@@ -173,45 +173,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -306,7 +301,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "��ǰ�ʤ��顢�Хå��⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -375,86 +370,82 @@ msgstr "�б����������������ޤ���: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "`%s'���ɹ��ߥ��顼: %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "�����ΰ����򹹿�"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "����ʸ�����̵����ʸ��������ޤ�\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "����ʸ�����̵����ʸ��������ޤ�\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "���顼: ̵���ʻ���\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "�����ɽ��"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "���顼: ̵���ʻ���\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -462,199 +453,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�����ʸ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "��������ͳ�����򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "̤�Τ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "�����å�: ��̩���ϴ��ˤ���ޤ�\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "ͭ�����¤��ѹ�"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "�����ɽ��"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "����Ū�ʥ��顼"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "��������������"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
 
@@ -681,7 +672,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1250,388 +1241,388 @@ msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "�����������ե�����`%s'���Ǥ��ޤ���\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߹��ߤޤ�\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s���Ѥ��ޤ���!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s�ϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URI�������ǽ\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź椬ɬ�פǤ� \n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ������\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key �桼����id"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key �桼����id"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 "����̾�ˤϰ�����ǽ��ʸ��������Τߤ��Ѥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
@@ -4564,55 +4555,55 @@ msgstr "�������Υ��르�ꥺ��%d�ϻ��ѤǤ��ޤ���\n"
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ楻�å���󸰤Ǥ�\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "���Υ��å�����gpg����������Ȥ�̵���Ǥ�\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "����������ȤΥ��饤�����pid������Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "������������ѤΥ����С��ɽФ�FD������Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "������������ѤΥ����С������FD������Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent�Ȥ��̿��㳲\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�縰ID %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4623,40 +4614,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u�ӥå�%s��, ID %08lX�������դ�%s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "�ѥ��ե졼���������\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "�ѥ��ե졼��������\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "�ѥ��ե졼����Ĺ�᤮�ޤ�\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "����������Ȥ����̵���ʱ���\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "�ѥ��ե졼��������: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4666,17 +4657,17 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u�ӥå�%s��, ID %08lX�������դ�%s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
diff --git a/po/nl.po b/po/nl.po
index 3ce088daa..f859e6d0f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2004-05-10 19:23+0200\n"
 "Last-Translator: Elros Cyriatan <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -35,8 +35,8 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr "geen entropie verzamelende module gevonden\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -140,18 +140,18 @@ msgstr "initialiseren van vertrouwensgegevensbank mislukt: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "opnieuw opbouwen sleutelbos buffer mislukt: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Sleutelaanmaak mislukt: %s\n"
@@ -177,45 +177,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "geen geldige OpenPGP-gegevens gevonden.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "fout bij maken wachtwoord: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "initialiseren van vertrouwensgegevensbank mislukt: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "verwijderen sleutelblok mislukt: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -308,7 +303,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "sorry, dat kan niet in batch-modus\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -377,86 +372,82 @@ msgstr "geen geassocieerde openbare sleutel: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "voorkeuren bijgewerkt"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "ongeldig teken in voorkeurtekenreeks\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "ongeldig teken in voorkeurtekenreeks\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fout: ongeldige vingerafdruk\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vingerafdruk weergeven"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fout: ongeldige vingerafdruk\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Sleutelaanmaak mislukt: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "geen geldige OpenPGP-gegevens gevonden.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fout bij schrijven geheime sleutelbos `%s': %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -464,199 +455,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Kies alstublieft wat voor sleutel u wilt hebben:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Ondertekening verlopen %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (alleen coderen)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kies alstublieft een reden voor de herroeping:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "onbekend beschermingsalgoritme\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Geheime delen van primaire sleutel zijn niet beschikbaar.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "overgeslagen: geheime sleutel reeds aanwezig\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "afsluiten"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "dit menu verlaten"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "conflicterende opdrachten\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "deze hulp weergeven"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Geen hulp beschikbaar"
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "de verloopdatum wijzigen"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "het eigenaarsvertrouwen wijzigen"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vingerafdruk weergeven"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "algemene fout"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "een nieuw sleutelpaar genereren"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "dat kan niet in batch-modus\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Opdracht> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "conflicterende opdrachten\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ongeldige opdracht (probeer \"hulp\")\n"
 
@@ -683,7 +674,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1264,369 +1255,369 @@ msgstr "WAARSCHUWING: onveilige omsluitende maptoegangsrechten op %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "nieuw configuratiebestand `%s' aangemaakt\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "LET OP: oude bestand voor standaard opties `%s' genegeerd\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand voor standaard opties `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "bezig met lezen opties uit `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor normaal gebruik!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "coderingsuitbreiding \"%s\" niet geladen vanwege onveilige toegangsrechten\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s is geen geldige tekenset\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kon sleutelserver URI niet inlezen\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ongeldige uitvoeropties\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ongeldige uitvoeropties\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ongeldige invoeropties\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "ongeldige invoeropties\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ongeldige uitvoeropties\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "ongeldige uitvoeropties\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ongeldige invoeropties\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ongeldige invoeropties\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ongeldige uitvoeropties\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ongeldige uitvoeropties\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kan exec-path niet instellen op %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "WAARSCHUWING: programma maakt mogelijk een core-bestand aan!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WAARSCHUWING: %s gaat boven %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s niet toegestaan met %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s slaat nergens op met %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "u kunt alleen losse of ongecodeerde ondertekeningen maken in --pgp2 modus\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "u kunt niet tegelijkertijd ondertekenen en coderen in --pgp2 modus\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "u dient bestanden te gebruiken (en niet een pijp) in --pgp2 modus.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "het coderen van een bericht in --pgp2 modus vereist de IDEA-codering\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "het gekozen coderingsalgoritme is ongeldig\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "het gekozen digest-algoritme is ongeldig\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "het gekozen coderingsalgoritme is ongeldig\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "het gekozen certificaat-digest-algoritme is ongeldig\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed moet groter zijn dan 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed moet groter zijn dan 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth moet binnen het bereik 1 tot 255 vallen\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ongeldig standaard controleniveau; moet 0, 1, 2 of 3 zijn\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ongeldig standaard controleniveau; moet 0, 1, 2 of 3 zijn\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "LET OP: eenvoudige S2K-modus (0) wordt sterk ontraden\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ongeldige S2K-modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "ongeldige standaardvoorkeuren\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "ongeldige persoonlijke coderingsvoorkeuren\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "ongeldige persoonlijke digestvoorkeuren\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "ongeldige persoonlijke inpakvoorkeuren\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s slaat nergens op met %s!\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "u kunt %s niet gebruiken in %s modus\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "u kunt %s niet gebruiken in %s modus\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "u kunt %s niet gebruiken in %s modus\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "initialiseren van vertrouwensgegevensbank mislukt: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WAARSCHUWING: ontvangers (-r) gegeven zonder gebruik te maken van openbare "
 "sleutel codering\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decodering mislukt: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "u kunt %s niet gebruiken in %s modus\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "u kunt %s niet gebruiken in %s modus\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [bestandsnaam]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikerscode"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikerscode"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key gebruikerscode"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key gebruikerscode"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikerscode [opdrachten]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikerscode] [sleutelbos]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Sleutelaanmaak mislukt: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Sleutelaanmaak mislukt: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Sleutelaanmaak mislukt: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Sleutelaanmaak mislukt: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "bijwerken geheim mislukt: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ontpantseren mislukt: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "bepantseren mislukt: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Ga uw gang en typ uw bericht...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1634,23 +1625,23 @@ msgstr ""
 "een notatienaam mag slechts afdrukbare tekens of spaties bevatten, en moet "
 "eindigen met een '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "een gebruikersnotatienaam moet het '@'-teken bevatten\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "een notatiewaarde mag geen stuurtekens bevatten\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "de gegeven certificatiebeleid URL is ongeldig\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "de gegeven ondertekeningbeleid URL is ongeldig\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "de gegeven ondertekeningbeleid URL is ongeldig\n"
@@ -4666,55 +4657,55 @@ msgstr "kan openbare sleutel algoritme %d niet behandelen\n"
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "deelpakket van soort %d heeft kritische bit ingesteld\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent is niet beschikbaar in deze sessie\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "kan PID voor agent niet instellen\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "misvormde GPG_AGENT_INFO omgevingsvariabele\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protocol versie %d wordt niet ondersteund\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan niet verbinden met `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "communicatieprobleem met gpg-agent\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probleem met de agent - gebruik van agent uit gezet\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hoofdsleutel ID %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4726,40 +4717,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s sleutel, ID %08lX, gemaakt op %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Herhaal wachtwoord\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Geef wachtwoord\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "wachtwoord te lang\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "ongeldig antwoord van agent\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "geannuleerd door gebruiker\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probleem met agent: agent geeft 0x%lx terug\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "kan niet vragen om wachtwoord in batch-modus\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Geef wachtwoord: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4769,17 +4760,17 @@ msgstr ""
 "U heeft een wachtwoord nodig om de geheime sleutel\n"
 "voor de gebruiker te ontgrendelen: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s sleutel, ID %08lX, gemaakt op %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Herhaal wachtwoord: "
 
diff --git a/po/pl.po b/po/pl.po
index 7c9698bb7..f90cef8da 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -43,8 +43,8 @@ msgstr "nie mo�na wygenerowa� liczby pierwszej kr�tszej od %d bit�w\n"
 msgid "no entropy gathering module detected\n"
 msgstr "modu� gromadzenia entropii nie zosta� wykryty\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -151,18 +151,18 @@ msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
@@ -188,45 +188,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -321,7 +316,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "niestety, to nie dzia�a w trybie wsadowym\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -390,88 +385,84 @@ msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizacja ustawie� klucza"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Odcisk klucza:"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -479,199 +470,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "wyj�cie"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "w"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "pomoc"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "lista"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Klucz dost�pny w: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "�ledzenia"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "w�kl"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lpodpis"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "odc"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "unpod"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "b��d og�lny"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "has�o"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
@@ -699,7 +690,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1280,369 +1271,369 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
 "dost�pu\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
 "tekstu\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1650,23 +1641,23 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i podkre�lenia, \n"
 "i musi ko�czy� si� ,,=''\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
@@ -4640,55 +4631,55 @@ msgstr ""
 "OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
 "bezpieczny\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "nie mo�na ustawi� numeru procesu klienckiego agenta\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "serwer nie chce czyta� deskryptora dla agenta\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "serwer nie chce pisa� deskryptora dla agenta\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "problem z porozumiewaniem si� z agentem\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem z agentem - zostaje wy��czony\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (podklucz %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4699,40 +4690,40 @@ msgstr ""
 "\"%.*s\".\n"
 "Klucz o d�ugo�ci %u bit�w, typ %s, numer %08lX, stworzony %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Powt�rzone has�o\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Has�o\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "has�o zbyt d�ugie\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "b��dna odpowied� agenta\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Podaj has�o: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4742,17 +4733,17 @@ msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 "\""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, numer %08lX, stworzony %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Powt�rz has�o: "
 
diff --git a/po/pt.po b/po/pt.po
index 135f91951..4233edc68 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: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+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"
@@ -36,8 +36,8 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr "nenhum m�dulo de recolha de entropia detectado\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -135,18 +135,18 @@ msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
@@ -172,45 +172,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -306,7 +301,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -375,86 +370,82 @@ msgstr "a escrever chave p�blica para `%s'\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncias actualizadas"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, 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:652
+#: g10/card-util.c:658
 #, 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:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, 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:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -462,199 +453,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, 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:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, 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:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "sair"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "erro geral"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -681,7 +672,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1254,369 +1245,369 @@ msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
 "inseguras\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizador"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizador"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1624,23 +1615,23 @@ msgstr ""
 "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
 "terminar com um '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -4613,55 +4604,55 @@ msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "n�o consegui colocar o pid do cliente no agente\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "n�o consigo obter FD de leitura no servidor para o agente\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "n�o consigo obter FD de escrita no servidor para o agente\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "problemas na comunica��o com o gpg-agent\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema com o agente - a desactivar a utiliza��o deste\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4674,40 +4665,40 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "resposta do agente inv�lida\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4717,17 +4708,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a1f8fe2a7..9c1c79a11 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -40,8 +40,8 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -140,18 +140,18 @@ msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
@@ -177,45 +177,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -311,7 +306,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -379,88 +374,84 @@ msgstr "escrevendo certificado p�blico para `%s'\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "lista prefer�ncias"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Impress�o digital:"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -468,201 +459,201 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, 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:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
 # INICIO MENU
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "sair"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "erro geral"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -690,7 +681,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1264,376 +1255,376 @@ msgstr "%s: novo arquivo de op��es criado\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1642,26 +1633,26 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -4589,55 +4580,55 @@ msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4649,43 +4640,43 @@ msgstr ""
 "usu�rio: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 #, fuzzy
 msgid "passphrase too long\n"
 msgstr "linha muito longa\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4695,17 +4686,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
diff --git a/po/ro.po b/po/ro.po
index 0577ee7ea..a27dfa95a 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2004-06-17 12:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -37,8 +37,8 @@ msgstr "nu pot genera un num�r prim cu mai pu�in de %d bi�i\n"
 msgid "no entropy gathering module detected\n"
 msgstr "nu a fost g�sit nici un modul de adunare a entropiei\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -142,18 +142,18 @@ msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
@@ -179,45 +179,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -312,7 +307,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "�mi pare r�u, nu pot face acest lucru �n modul batch\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -381,86 +376,82 @@ msgstr "nici o cheie public� corespunz�toare: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferin�e actualizate"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter invalid �n �ir preferin�e\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter invalid �n �ir preferin�e\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "eroare: amprent� invalid�\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "afi�eaz� amprenta"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "eroare: amprent� invalid�\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -468,199 +459,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Selecta�i ce fel de cheie dori�i:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritm de protec�ie necunoscut\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "s�rit�: cheia secret� deja prezent�\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "termin�"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "t"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "comenzi �n conflict\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "ajutor"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "enumer�"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Cheie disponibil� la: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "depanare"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "activ"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "semloc"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "schimb� data de expirare"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "schimb� �ncrederea pentru proprietar"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "ampr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "afi�eaz� amprenta"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsem"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "eroare general�"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "parola"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Comand�> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
@@ -687,7 +678,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1270,373 +1261,373 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut \"%s\"\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "extensie cifru \"%s\" nu a fost �nc�rcat din cauza permisiunilor nesigure "
 "(unsafe)\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nu este un set de carectere valid\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URI pentru serverul de chei\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
 "--pgp2\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
 "activat.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie s� fie �n intervalul 1..255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de cifrare \"%s\" c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algorimul de rezumat \"%s\" c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "nu pute�i folosi algoritmul de compresie \"%s\" c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
 "public�\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decriptarea a e�uat: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizator"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizator"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1644,24 +1635,24 @@ msgstr ""
 "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
 "�i s� se termine cu un '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 "o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de control\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
@@ -4642,55 +4633,55 @@ msgstr ""
 "AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
 "(insecure)\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "nu pot seta pid-ul client pentru agent\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "nu pot convinge serverul s� citeasc� FD pentru agent\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "nu pot convinge serverul s� scrie FD pentru agent\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "probleme de comunicare cu gpg-agent\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem� cu agentul - deactivez  folosirea agentului\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principal� %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4702,40 +4693,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit cheia %s, ID %08lX, creat� %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Repeta�i fraza-parol�\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Introduce�i fraza-parol�\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "fraz�-parol� prea lung�\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "r�spuns invalid de la agent\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "nu pot cere parola �n modul batch\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Introduce�i fraza-parol�: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4745,17 +4736,17 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia\n"
 "secret� pentru utilizator: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cheia %2$s de %1$u-bi�i, ID %3$08lX, creat� %4$s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Repeta�i fraza-parol�: "
 
diff --git a/po/ru.po b/po/ru.po
index f90d1aaee..25e076eee 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2003-12-23 19:24+0100\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -34,8 +34,8 @@ msgstr "не могу создать главное число меньшее %d
 msgid "no entropy gathering module detected\n"
 msgstr "не найден модуль накопления энтропии\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -136,18 +136,18 @@ msgstr "сбой инициализации таблицы доверий: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "неудача при отправке на сервер ключей: %s\n"
@@ -173,45 +173,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "сбой при удалении блока ключа: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -306,7 +301,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "извините, но это невозможно выполнить в пакетном режиме\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -375,86 +370,82 @@ msgstr "нет соотвествующего открытого ключа: %s\
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "обновить предпочтения"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недопустимый символ в строке предпочтений\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недопустимый символ в строке предпочтений\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "ошибка: неверный отпечаток\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "показать отпечаток"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "ошибка: неверный отпечаток\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -462,199 +453,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Выберите причину отзыва:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "неизвестный алгоритм защиты\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "пропущено: секретный ключ уже имеется\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "Выход"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "несовместимые команды\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "показать эту справку"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Ключ доступен: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "сменить срок действия"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "показать отпечаток"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "общая ошибка"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "создать новую пару ключей"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "не могу делать это в пакетном режиме\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несовместимые команды\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
@@ -681,7 +672,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1248,367 +1239,367 @@ msgstr "ВНИМАНИЕ: небезопасные права доступа к
 msgid "unknown configuration item `%s'\n"
 msgstr "файл конфигурации содержит неизвестный параметр \"%s\"\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: файл настроек старого формата `%s' проигнорирован\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл настроек `%s' не обнаружен\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл настроек `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "настройки взяты из файла `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного использования!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра \"%s\" не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s недопустимая таблица символов\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URI сервера ключей\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заменит %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s недопустимо использовать с %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифровки сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 1, 2 или 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой (0) режим S2K строго не рекомендуется\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s не работает пока с %s\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать шифрование \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать сжатие \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Вы не можете использовать %s в режиме %s\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Вы не можете использовать %s в режиме %s\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "неудача при отправке на сервер ключей: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "неудача при получении с сервера ключей: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "не удалось экспортировать ключ: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "неудача при поиске на сервере ключей: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "неудача при обновлении на сервере ключей: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1616,23 +1607,23 @@ msgstr ""
 "имя примечания должно содержать только печатные символы или пробелы,и "
 "заканчиваться знаком '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "имя примечания должно содержать '@' символ\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "значение примечания не должно содержать управляющие символы\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL правил сертификации неверен\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL правил подписи неверен\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL правил подписи неверен\n"
@@ -4582,55 +4573,55 @@ msgstr ""
 "ВНИМАНИЕ: потенциально небезопасный симметрично зашифрованный сеансовый "
 "ключ\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "не могу установить pid для агента\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "не могу получить дескриптор чтения для агента\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "не могу получить дескриптор записи для агента\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "не могу подключиться к `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "коммуникационный проблемы с gpg-agent\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "проблема с агентом - использование агента отключено\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (главный идентификатор ключа %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4641,40 +4632,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бит %s ключ, ID %08lX, создан %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Повторите пароль\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Введите пароль\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "пароль слишком длинный\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "неверный ответ от агента\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "проблема с агентом: агент вернул 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "не могу получить пароль в пакетном режиме\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Введите пароль: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4684,17 +4675,17 @@ msgstr ""
 "Необходим пароль для доступа к секретному ключу пользователя:\n"
 "\""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бит %s ключ, ID %08lX, создан %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Повторите пароль: "
 
diff --git a/po/sk.po b/po/sk.po
index 12bc2d57e..4388c7c4f 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: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+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"
@@ -32,8 +32,8 @@ msgstr "nem��em vytvori� prvo��slo s d�kou menej ako %d bitov\n"
 msgid "no entropy gathering module detected\n"
 msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -132,18 +132,18 @@ msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
@@ -169,45 +169,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -302,7 +297,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -371,86 +366,82 @@ msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizova� predvo�by"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, 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:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -458,199 +449,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, 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:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, 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:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, 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:1075
+#: g10/card-util.c:1092
 #, 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:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "ukon�i�"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "u"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeni� dobu platnosti"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "v�eobecn� chyba"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Pr�kaz> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
@@ -677,7 +668,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1256,372 +1247,372 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
 "bezpe�ne\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
 "ako text\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u��vate�a"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u��vate�a"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u��vate�a] [s�bor s k���mi (keyring)]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1629,23 +1620,23 @@ msgstr ""
 "meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
 "kon�i� s '='\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -4622,55 +4613,55 @@ msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "nem��em nastavi� PID klienta pre gpg-agenta\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "nemo�no z�ska� server read file descriptor pre agenta\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "nemo�no z�ska� server write file descriptor pre agenta\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�m v komunik�cii s gpg-agentom\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentom - pou��vanie agenta vypnut�\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID k���a %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4681,40 +4672,40 @@ msgstr ""
 "\"%.*s\"\n"
 "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Opakova� heslo\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Vlo�i� heslo\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "heslo je pr�li� dlh�\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "neplatn� reakcia od agenta\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "v d�vkovom re�ime sa nem��em p�ta� na heslo\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4724,17 +4715,17 @@ msgstr ""
 "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
 "u��vate�a: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
diff --git a/po/sv.po b/po/sv.po
index 5f89ee7d2..a852fb719 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2004-09-20 22:12+0100\n"
 "Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -53,8 +53,8 @@ msgstr "kan inte skapa ett  primtal med mindre än %d bits\n"
 msgid "no entropy gathering module detected\n"
 msgstr "ingen demon för entropisamling hittad\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -156,18 +156,18 @@ msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
@@ -193,45 +193,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "fel vid skapandet av lösenmening: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -328,7 +323,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "kan inte göra detta i batch-läge\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -397,86 +392,82 @@ msgstr "ingen tillhörande öppen nyckel: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uppdaterat inställningar"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ogiltigt tecken i inställningssträngen\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ogiltigt tecken i inställningssträngen\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "visa fingeravtryck"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -484,201 +475,201 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Välj anledning till att nyckeln spärras:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "okänd krypteringsalgoritm\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "avsluta"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Nyckeln tillgänglig hos: "
 
 # ???
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "ändra utgångsdatum"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
 # originalet borde ha ett value
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
 # skall dessa översättas?
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "allmänt fel"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "kan inte göra detta i batch-läge\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (försök med \"help\")\n"
 
@@ -706,7 +697,7 @@ msgid "Enter PIN: "
 msgstr ""
 
 # se förra kommentaren
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1283,152 +1274,152 @@ msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "okänt configurationspost \"%s\"\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: inställningsfilen \"%s\" används inte\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser flaggor från \"%s\"\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "chiffertillägget \"%s\" laddades inte pga osäkra behörigheter\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s: felaktiga exportalternativ %d\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "felaktiga exportalternativ\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s: felaktiga importalternativ %d\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "felaktiga importalternativ\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s: felaktiga exportalternativ %d\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "felaktiga exportalternativ\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s: felaktiga importalternativ %d\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "felaktiga importalternativ\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s: felaktiga exportalternativ %d\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "felaktiga exportalternativ\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte sätta exec-sökvägen till %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "du kan inte både signera och kryptera samtidigt tillsammans med --pgp2\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) tillsammans med --pgp2\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "för att kryptera meddelanden med --pgp2 krävs IDEA-insticksprogrammet\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är ogiltig\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är ogiltig\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är ogiltig\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är ogiltig\n"
 
@@ -1438,15 +1429,15 @@ msgstr "den valda kontrollsummealgoritmen är ogiltig\n"
 # är ändå litet. Eventuellt borde meddelandena inte alls
 # översättas för att göra eventuell felsökning lättare
 # för internationella felsökare
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" måste ha ett värde mellan 1 och 255\n"
@@ -1454,210 +1445,210 @@ msgstr "variabeln \"max-cert-depth\" måste ha ett värde mellan 1 och 255\n"
 # cert-level? Vad är det?
 # inte testnivå i alla fall!
 # Kanske är det nivån för hur lång förtroendekedjan får vara?
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "ogiltigt standardvärde för certifikatnivån; måste vara 0, 1, 2 eller 3\n"
 
 # testnivå!? Vad är detta???
 # längd på förtroendekedjan?
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "ogiltigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "ogiltiga standardinställningar\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "felaktiga inställningar av krypteringsalgoritm\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "felaktiga inställningar av checksummealgoritm\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "felaktiga inställningar av kompressionsalgoritm\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda chifferalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key användaridentitet"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key användaridentitet"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Export av nyckeln misslyckades: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig kontrollsummealgoritm `%s'\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1666,23 +1657,23 @@ msgstr ""
 "understrykningstecken och sluta med ett likhetstecken\n"
 
 # user notation namme??
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknetr\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifikationspolicy är ogiltig\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
@@ -4714,57 +4705,57 @@ msgstr "kan inte hantera algoritm %d för öppna nycklar\n"
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
 # vad är detta?
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "kan inte ange pid för GPG-Agent\n"
 
 # FD?
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "kan inte få server-läs FD för GPG-Agent\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "kan inte få server-skriv FD för GPG-Agent\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "problem vid kommunikation med GPG-Agent\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem med GPG-Agent, inaktiverar den\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (huvudnyckelns identitet %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4775,40 +4766,40 @@ msgstr ""
 "användaren: \"%.*s\"\n"
 "%u-bitars %s-nyckel, ID %08lX, skapad %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Repetera lösenmeningen\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Ange lösenmening\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "lösenmeningen är för lång\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "felaktigt svar från GPG-Agent\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "kan inte fråga efter lösenmening i batch-läge\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Ange lösenmening: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4818,17 +4809,17 @@ msgstr ""
 "Du behöver en lösenmening för att låsa upp den hemliga nyckeln för\n"
 "användaren: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits  %s-nyckel, ID %08lX, skapad %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Repetera lösenmeningen: "
 
diff --git a/po/tr.po b/po/tr.po
index 15fc5c8a0..2e6ade0cb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2004-07-08 08:10+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -35,8 +35,8 @@ msgstr "%d bitten daha küçük bir asal sayı üretilemiyor\n"
 msgid "no entropy gathering module detected\n"
 msgstr "rasgele bayt elde etme modülü bulunamadı\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -136,18 +136,18 @@ msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız:
 msgid "failed to store the creation date: %s\n"
 msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver send başarısızlığa uğradı: %s\n"
@@ -173,45 +173,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "anahtar bloğu silinemedi: %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -306,7 +301,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "pardon, bu betik kipinde yapılamaz\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -375,88 +370,84 @@ msgstr "karşılığı olan genel anahtar yok: `%s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "güncelenmiş tercihler"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "tercih dizgesindeki karakter geçersiz\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "tercih dizgesindeki karakter geçersiz\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "hata: parmakizi geçersiz\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr " Parmak izi:"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "hata: parmakizi geçersiz\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -464,199 +455,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "bilinmeyen sıkıştırma algoritması\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "k"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "çelişen komutlar\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "bunu gösterir "
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "Anahtar burada: "
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "son kullanım tarihini değiştirir"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "parmak izini gösterir"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "genel hata"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "bu önceden belirlenmiş işlemler kipinde (in batchmode) yapılamaz\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
 
@@ -683,7 +674,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1253,364 +1244,364 @@ msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "bilinmeyen yapılandırma öğesi \"%s\"\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "şifre uzantısı \"%s\" güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s geçerli bir karakter seti değil\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s henüz %s ile çalışmıyor\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s şifreleme algoritması kullanılamayabilir.\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s özümleme algoritması kullanılamayabilir.\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s sıkıştırma algoritması kullanılamayabilir.\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key KULL-KML"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key KULL-KML"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh başarısız: %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1618,23 +1609,23 @@ msgstr ""
 "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
@@ -4620,55 +4611,55 @@ msgstr "%d genel anahtar algoritması kullanılamadı\n"
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "istemci pid'i belirlenemiyor\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "sunucu okuma dosya tanıtıcısı alınamadı\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "sunucu yazma dosya tanıtıcısı alınamadı\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent ile haberleşme problemi\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4679,40 +4670,40 @@ msgstr ""
 "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n"
 "%u bitlik %s anahtarı, kimlik %08lX, oluşturulan %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "Parolayı tekrar yazınız\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "Parola çok uzun\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "yanıt geçersiz\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "önceden tanımlanmış işlemler kipinde (batchmode) parola sorgulanamaz\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "Anahtar parolasını girin: "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4722,19 +4713,19 @@ msgstr ""
 "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
 "Anahtarın sahibi: \""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 "%u bitlik %s anahtarı, %08lX kimliği ile\n"
 "%s tarihinde üretilmiş"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "Tekrar: "
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 970bc8ebe..134e7e418 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2004-07-20 15:50+0200\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -34,8 +34,8 @@ msgstr "�޷����ɶ��� %d λ������\n"
 msgid "no entropy gathering module detected\n"
 msgstr "��ⲻ�������Ѽ�ģ��\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -134,18 +134,18 @@ msgstr "��ʼ�����ζ����ݿ�ʧ�ܣ�%s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "���½���Կ�׻�����ʧ�ܣ� %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "�޷����͵���Կ��������%s\n"
@@ -171,45 +171,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�Ҳ�����Ч�� OpenPGP ���ݡ�\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "���������ʱ��������%s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "��ʼ�����ζ����ݿ�ʧ�ܣ�%s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "ɾ����Կ����ʱʧ�ܣ�%s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -302,7 +297,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "��Ǹ����������ģʽ���޷���ɴ˲���\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -371,86 +366,82 @@ msgstr "û�����Ӧ�Ĺ�Կ��%s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "��ȡ��%s��ʱ������%s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "���¹�����ѡ��"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "��ѡ���ַ���������Ч���ַ�\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "��ѡ���ַ���������Ч���ַ�\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "������Ч��ָ��\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "��ʾָ��"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "������Ч��ָ��\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "������Կʧ�ܣ�%s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�Ҳ�����Ч�� OpenPGP ���ݡ�\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "д��˽ԿԿ�׻���%s��ʱ�������� %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -458,199 +449,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "��ѡ����Ҫʹ�õ���Կ���ࣺ\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "���ǩ������ %s ���ڡ�\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (�����ڼ���)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "��Ч��ѡ��\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "��ѡ�������ԭ��\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "δ֪�ı����㷨\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "��Կ��˽Կ�����޷�ȡ�á�\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "��������˽Կ�Ѵ���\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "�뿪����˵�"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "��ͻ��ָ��\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "��ʾ�������˵��"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "��Կ��ȡ�ԣ�"
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "����ʹ������"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�������ζ�"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "��ʾָ��"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "�������"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "����һ���µ���Կ��"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "�ò����޷���������ģʽ�н���\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "����> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "��ͻ��ָ��\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "��Ч��ָ��(���ԡ�help��)\n"
 
@@ -677,7 +668,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1239,385 +1230,385 @@ msgstr "���棺%s �Ĺر�Ŀ¼Ȩ�޲���ȫ��%s��\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "δ֪�������%s��\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ע�⣺��ʽ��Ĭ�������ļ���%s���ѱ�����\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ע�⣺û��Ĭ�������ļ���%s��\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "�����ļ���%s����%s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�ӡ�%s����ȡѡ��\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ע�⣺һ������²����õ� %s��\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�ԳƼ����ܷ���չģ�顰%s����ΪȨ�޲���ȫ��δ������\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ����һ����Ч���ַ���\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�޷�������Կ������ URI\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s��%d����Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "��Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s��%d����Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "��Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s��%d����Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "��Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s��%d����Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "��Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s��%d����Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "��Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�޷�������·����� %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "���棺������ܻᴴ�������ڴ�ת����\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "���棺%s ��ʹ�� %s ʧЧ\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ������ %s ����\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �� %s ���������壡\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "��ֻ���� --pgp2 ģʽ�²���������ʽ������ǩ��\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "���� --pgp2 ģʽ��ʱ������ͬʱǩ�ֺͼ���\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� --pgp2 ʱ��Ӧ��ֻʹ���ļ������ǹܵ�\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�� --pgp2 ģʽ�¼��ܱ�����Ҫ IDEA �㷨\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "��ѡ�ĶԳƼ����㷨��Ч\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "��ѡ��ɢ���㷨��Ч\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "��ѡ�ĶԳƼ����㷨��Ч\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "��ѡ��֤��ɢ���㷨��Ч\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "��Ҫ����ȫ����ǩ����һ��Ҫ���� 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "��Ҫ����ǿ����ǩ����һ��Ҫ���� 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "�����֤���һ��Ҫ���� 1 �� 255 ֮��\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "��Ч��Ĭ����֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "��Ч����С��֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ע�⣺ǿ�Ҳ�����ʹ�ü򵥵� S2K ģʽ(0)\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "��Ч�� S2K ģʽ�������� 0��1 �� 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "��Ч��Ĭ����ѡ��\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "��Ч�ĸ��˶ԳƼ����㷨��ѡ��\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "��Ч�ĸ���ɢ���㷨��ѡ��\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "��Ч�ĸ���ѹ���㷨��ѡ��\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s Ŀǰ�޷��� %s ����\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�����ý��ԳƼ����㷨��%s������ %s ģʽ��\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "�����ý�ɢ���㷨��%s������ %s ģʽ��\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "�����ý�ѹ���㷨��%s������ %s ģʽ��\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "��ʼ�����ζ����ݿ�ʧ�ܣ�%s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "���棺�������ռ���(-r)����δʹ�ù�Կ����\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [�ļ���]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ļ���]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "����ʧ�ܣ�%s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ļ���]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [�ļ���]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "�����ý� %s ���� %s ģʽ��\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [�ļ���]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ļ���]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ļ���]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "�����ý� %s ���� %s ģʽ��\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ļ���]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ļ���]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ļ���]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key �û���ʶ"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �û���ʶ"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key �û���ʶ"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key �û���ʶ"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �û���ʶ [ָ��]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�û���ʶ] [Կ�׻�]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�޷����͵���Կ��������%s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�޷��ӹ�Կ���������գ�%s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "�޷�������Կ��%s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�޷��ڹ�Կ��������������%s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�޷��ӹ�Կ�������ϸ��£�%s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "�⿪ ASCII ��װʧ�ܣ�%s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "���� ASCII ��װʧ�ܣ�%s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "��Ч�ġ�%s��ɢ���㷨\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[�ļ���]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "�뿪ʼ�������ı��ġ���\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "������Ʊ���ֻ���пɴ�ӡ���ַ���ո񣬲���һ����=������β\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�û��������һ��Ҫ���С�@���ַ�\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "���ֵһ������ʹ���κεĿ����ַ�\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "�����ĵ���֤���� URL ��Ч\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "������ǩ�ֲ��� URL ��Ч\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "������ǩ�ֲ��� URL ��Ч\n"
@@ -4549,55 +4540,55 @@ msgstr "�޷�������Կ�㷨 %d\n"
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "���棺����DZ�ڰ�ȫ��в�ĶԳƼ��ܻỰ��Կ\n"
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d �����Ӱ��趨�˹ؼ��ֽ�\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent �ڴ˴��Ự���޷�ʹ��\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "�޷��趨��������ͻ��˵Ľ��̱�ʶ\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "�޷�ȡ�ô�����������ķ�������ȡ�ļ�������\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "�޷�ȡ�ô�����������ķ�����д���ļ�������\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO ����������ʽ����\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��֧�� gpg-agent Э��汾 %d\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�޷���������%s����%s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "�� gpg-agent ͨѶ������\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "������������⡪������ͣ�ô�������\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr "(��Կ�׺� %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4608,40 +4599,40 @@ msgstr ""
 "��%.*s��\n"
 "%u �ֽڵ� %s ��Կ��Կ�׺� %08lX�������� %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "��������һ������\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "����������\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "����̫��\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "����������Ӧ��Ч\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "�û�ȡ��\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "������������⣺�������򷵻� 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "��������ģʽ���޷�ѯ������\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "���������룺"
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4651,17 +4642,17 @@ msgstr ""
 "����Ҫ����ʹ���ߵ����룬���ܽ⿪˽Կ��\n"
 "\""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u �ֽڵ� %s ��Կ��Կ�׺� %08lX�������� %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "��������һ�����룺"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1bd430058..a85bf287d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-15 15:17+0200\n"
+"POT-Creation-Date: 2004-10-26 18:05+0200\n"
 "PO-Revision-Date: 2003-05-13 15:48+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -36,8 +36,8 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr "��������üƻ`���Ҳ�\n"
 
-#: cipher/random.c:387 g10/card-util.c:588 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3188 g10/import.c:175
+#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
+#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
 #: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
 #: g10/tdbio.c:539 g10/tdbio.c:600
@@ -136,18 +136,18 @@ msgstr "�H����Ʈw�ҩl���ѡG %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "���s�إ��_�Ͱ�֨����ѡG %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1308
+#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:1314
+#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:1337
+#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
@@ -173,45 +173,40 @@ msgstr ""
 msgid "Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:827
-#, c-format
-msgid "prassphrase (CHV%d) is too short; minimum length is %d\n"
-msgstr ""
-
 #: g10/app-openpgp.c:1301
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1592
+#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�䤣�즳�Ī� OpenPGP ��ơC\n"
 
-#: g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1668
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "�إ߱K�X�ꪺ�ɭԵo�Ϳ��~�G %s\n"
 
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1763
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�H����Ʈw�ҩl���ѡG %s\n"
 
-#: g10/app-openpgp.c:1800
+#: g10/app-openpgp.c:1805
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "�R�����_�϶��ɥ��ѤF�G %s\n"
 
-#: g10/app-openpgp.c:1807
+#: g10/app-openpgp.c:1812
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1815
+#: g10/app-openpgp.c:1820
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1826
+#: g10/app-openpgp.c:1831
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -304,7 +299,7 @@ msgstr ""
 msgid "sorry, can't do this in batch mode\n"
 msgstr "��p�A�L�k�b�妸�Ҧ����o�˰�\n"
 
-#: g10/card-util.c:94 g10/card-util.c:964 g10/card-util.c:1042
+#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
 #: g10/keygen.c:1361
 msgid "Your selection? "
@@ -373,86 +368,82 @@ msgstr "�S���۹��������_�G %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:597 g10/import.c:261
+#: g10/card-util.c:603 g10/import.c:261
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Ū�� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:611
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:615
+#: g10/card-util.c:621
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:635
+#: g10/card-util.c:641
 #, fuzzy
 msgid "Language preferences: "
 msgstr "��s�L�����n"
 
-#: g10/card-util.c:643
+#: g10/card-util.c:649
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "���n�]�w�r��̦��L�Ī��r��\n"
 
-#: g10/card-util.c:652
+#: g10/card-util.c:658
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "���n�]�w�r��̦��L�Ī��r��\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:679
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:687
+#: g10/card-util.c:693
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "���~�G�L�Ī�����\n"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:714
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "��ܫ���"
 
-#: g10/card-util.c:731
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "���~�G�L�Ī�����\n"
 
-#: g10/card-util.c:779
+#: g10/card-util.c:785
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:786
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�䤣�즳�Ī� OpenPGP ��ơC\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:795
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�g�J�p�_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:878
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:891
+#: g10/card-util.c:899 g10/card-util.c:908
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:901
-msgid "Inhibit off-card backup of encryption key? (y/N) "
-msgstr ""
-
-#: g10/card-util.c:912
+#: g10/card-util.c:920
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:921
+#: g10/card-util.c:929
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -460,199 +451,199 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:955
+#: g10/card-util.c:968
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�п�ܩp�n�ϥΪ����_�����G\n"
 
-#: g10/card-util.c:957 g10/card-util.c:1033
+#: g10/card-util.c:970 g10/card-util.c:1050
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
 
-#: g10/card-util.c:958 g10/card-util.c:1035
+#: g10/card-util.c:971 g10/card-util.c:1052
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (�ȯ�[�K��)\n"
 
-#: g10/card-util.c:959 g10/card-util.c:1037
+#: g10/card-util.c:972 g10/card-util.c:1054
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/card-util.c:1053 g10/keyedit.c:907
+#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
 #: g10/keygen.c:1395 g10/revoke.c:639
 msgid "Invalid selection.\n"
 msgstr "�L�Ī���ܡC\n"
 
-#: g10/card-util.c:1030
+#: g10/card-util.c:1047
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�п�ܺM�P����]�G\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1082
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������O�@�t��k\n"
 
-#: g10/card-util.c:1070
+#: g10/card-util.c:1087
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "�D�_���p�_�����S��k���ΡC\n"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1092
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "�w���L�G�p�_�w�g�s�b\n"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit"
 
-#: g10/card-util.c:1142 g10/keyedit.c:1245
+#: g10/card-util.c:1162 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "���}�o�ӿ��"
 
-#: g10/card-util.c:1143 g10/keyedit.c:1246
+#: g10/card-util.c:1163 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1144
+#: g10/card-util.c:1164
 #, fuzzy
 msgid "show admin commands"
 msgstr "���O�����٬�\n"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1145 g10/keyedit.c:1248
+#: g10/card-util.c:1165 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "��ܳo���u�W����"
 
-#: g10/card-util.c:1147 g10/keyedit.c:1251
+#: g10/card-util.c:1167 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1167
 #, fuzzy
 msgid "list all available data"
 msgstr "�S���i������"
 
-#: g10/card-util.c:1148 g10/keyedit.c:1252
+#: g10/card-util.c:1168 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1149 g10/keyedit.c:1263
+#: g10/card-util.c:1169 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1150
+#: g10/card-util.c:1170
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1151
+#: g10/card-util.c:1171
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1152
+#: g10/card-util.c:1172
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1153
+#: g10/card-util.c:1173
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1154
+#: g10/card-util.c:1174
 #, fuzzy
 msgid "change the login name"
 msgstr "���ϥδ���"
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1155
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "change the language preferences"
 msgstr "���D�[�H��"
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1176
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1157
+#: g10/card-util.c:1177
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "��ܫ���"
 
-#: g10/card-util.c:1158
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1159
+#: g10/card-util.c:1179
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1160
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "generate"
 msgstr "�@��ʿ��~"
 
-#: g10/card-util.c:1161
+#: g10/card-util.c:1181
 #, fuzzy
 msgid "generate new keys"
 msgstr "���ͤ@���s�����_��"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1287
+#: g10/card-util.c:1182 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1162
+#: g10/card-util.c:1182
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1178 g10/delkey.c:120 g10/keyedit.c:1313
+#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
 msgid "can't do that in batchmode\n"
 msgstr "�L�k�b�妸�Ҧ������˰�\n"
 
-#: g10/card-util.c:1226 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1393
 msgid "Command> "
 msgstr "���O> "
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1281
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "���O�����٬�\n"
 
-#: g10/card-util.c:1336 g10/keyedit.c:1860
+#: g10/card-util.c:1356 g10/keyedit.c:1860
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�L�Ī����O  (�ոլ� \"help\")\n"
 
@@ -679,7 +670,7 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3538 g10/verify.c:101
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
 #: g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -1240,387 +1231,387 @@ msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "�s���]�w�� `%s' �Q�إߤF\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1762
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "�Ъ`�N�G�¦����w�]�ﶵ�� `%s' �w�Q����\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1804
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "�Ъ`�N�G�S���w�]�ﶵ�� `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1808
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "�ﶵ�� `%s' �G %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1815
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�q `%s' Ū���ﶵ\n"
 
-#: g10/g10.c:2029 g10/g10.c:2545 g10/g10.c:2556
+#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "�Ъ`�N�G�@�뱡�p�U���|�Ψ� %s�I\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2048
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�s�K�k�����Ҳ� \"%s\" �]���\�i���w���ӥ��Q���J\n"
 
-#: g10/g10.c:2254
+#: g10/g10.c:2260
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ���O�@�Ӧ��Ī��r����\n"
 
-#: g10/g10.c:2273 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3433
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�L�k���R���_���A�� URI\n"
 
-#: g10/g10.c:2279
+#: g10/g10.c:2285
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2288
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2295
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2298
 msgid "invalid import options\n"
 msgstr "�L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:2299
+#: g10/g10.c:2305
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:2302
+#: g10/g10.c:2308
 msgid "invalid export options\n"
 msgstr "�L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2315
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:2312
+#: g10/g10.c:2318
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:2334
+#: g10/g10.c:2340
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2343
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:2344
+#: g10/g10.c:2350
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�L�k������ɸ��|�]�� %s\n"
 
-#: g10/g10.c:2534
+#: g10/g10.c:2540
 msgid "WARNING: program may create a core file!\n"
 msgstr "ĵ�i�G�{���i��|�ɦL�X�֤��ɡI\n"
 
-#: g10/g10.c:2538
+#: g10/g10.c:2544
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ĵ�i�G %s �|�ϱo %s ����\n"
 
-#: g10/g10.c:2547
+#: g10/g10.c:2553
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ���Q���\�� %s �֥�\n"
 
-#: g10/g10.c:2550
+#: g10/g10.c:2556
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2577
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "�p�馳�b --pgp2 �Ҧ��U�ׯవ�X�������Ω���ñ��\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2583
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "�p�b --pgp2 �Ҧ��U�ɡA����P��ñ�p�M�[�K\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2589
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "�ҥ� --pgp2 �ɩp�����Өϥ��ɮסA�ӫD�޹D\n"
 
-#: g10/g10.c:2596
+#: g10/g10.c:2602
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�b --pgp2 �Ҧ��U�[�K�T���ݭn IDEA �s�K�k\n"
 
-#: g10/g10.c:2666 g10/g10.c:2690
+#: g10/g10.c:2672 g10/g10.c:2696
 msgid "selected cipher algorithm is invalid\n"
 msgstr "�ҿ諸�s�K�t��k�L��\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2678 g10/g10.c:2702
 msgid "selected digest algorithm is invalid\n"
 msgstr "�ҿ諸�K�n�t��k�L��\n"
 
-#: g10/g10.c:2678
+#: g10/g10.c:2684
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "�ҿ諸�s�K�t��k�L��\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2690
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "�ҿ諸���ҺK�n�t��k�L��\n"
 
-#: g10/g10.c:2699
+#: g10/g10.c:2705
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed �@�w�n�j�� 0\n"
 
-#: g10/g10.c:2701
+#: g10/g10.c:2707
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed �@�w�n�j�� 1\n"
 
-#: g10/g10.c:2703
+#: g10/g10.c:2709
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth �@�w�n���� 1 �M 255 ����\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2711
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�L�Ī� default-check-level �F�@�w�n�O 0 �B 1 �B 2 �� 3\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2713
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�L�Ī� default-check-level �F�@�w�n�O 0 �B 1 �B 2 �� 3\n"
 
-#: g10/g10.c:2710
+#: g10/g10.c:2716
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "�Ъ`�N�G�j�P����ij�ϥγ�ª� S2K �Ҧ� (0)\n"
 
-#: g10/g10.c:2714
+#: g10/g10.c:2720
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�L�Ī� S2K �Ҧ��F�@�w�n�O 0 �B 1 �� 3\n"
 
-#: g10/g10.c:2721
+#: g10/g10.c:2727
 msgid "invalid default preferences\n"
 msgstr "�L�Ī��w�]���n\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2736
 msgid "invalid personal cipher preferences\n"
 msgstr "�L�Ī��ӤH�s�K�k���n\n"
 
-#: g10/g10.c:2734
+#: g10/g10.c:2740
 msgid "invalid personal digest preferences\n"
 msgstr "�L�Ī��ӤH�K�n���n\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2744
 msgid "invalid personal compress preferences\n"
 msgstr "�L�Ī��ӤH���Y���n\n"
 
-#: g10/g10.c:2771
+#: g10/g10.c:2777
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2824
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/g10.c:2823
+#: g10/g10.c:2829
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/g10.c:2828
+#: g10/g10.c:2834
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/g10.c:2924
+#: g10/g10.c:2930
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�H����Ʈw�ҩl���ѡG %s\n"
 
-#: g10/g10.c:2935
+#: g10/g10.c:2941
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "ĵ�i�G���w������� (-r) ���ϥΤ��_�[�K\n"
 
-#: g10/g10.c:2946
+#: g10/g10.c:2952
 msgid "--store [filename]"
 msgstr "--store [�ɦW]"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2959
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ɦW]"
 
-#: g10/g10.c:2955
+#: g10/g10.c:2961
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "�ѱK���ѡG %s\n"
 
-#: g10/g10.c:2965
+#: g10/g10.c:2971
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ɦW]"
 
-#: g10/g10.c:2978
+#: g10/g10.c:2984
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [�ɦW]"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2986
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2983
+#: g10/g10.c:2989
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3007
 msgid "--sign [filename]"
 msgstr "--sign [�ɦW]"
 
-#: g10/g10.c:3014
+#: g10/g10.c:3020
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ɦW]"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3035
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ɦW]"
 
-#: g10/g10.c:3031
+#: g10/g10.c:3037
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3034
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/g10.c:3054
+#: g10/g10.c:3060
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ɦW]"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3069
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ɦW]"
 
-#: g10/g10.c:3088
+#: g10/g10.c:3094
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ɦW]"
 
-#: g10/g10.c:3096
+#: g10/g10.c:3102
 msgid "--sign-key user-id"
 msgstr "--sign-key �ϥΪ�ID"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3106
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �ϥΪ�ID"
 
-#: g10/g10.c:3104
+#: g10/g10.c:3110
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key �ϥΪ�ID"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3114
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key �ϥΪ�ID"
 
-#: g10/g10.c:3132
+#: g10/g10.c:3138
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �ϥΪ�ID [���O]"
 
-#: g10/g10.c:3203
+#: g10/g10.c:3209
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�ϥΪ�ID] [�_�Ͱ�]"
 
-#: g10/g10.c:3240
+#: g10/g10.c:3246
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3248
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:3244
+#: g10/g10.c:3250
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:3255
+#: g10/g10.c:3261
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:3265
+#: g10/g10.c:3271
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "��s�p�_���ѡG %s\n"
 
-#: g10/g10.c:3306
+#: g10/g10.c:3312
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "�Ѷ}�ʸ˥��ѡG %s\n"
 
-#: g10/g10.c:3314
+#: g10/g10.c:3320
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�i��ʸ˥��ѡG %s\n"
 
-#: g10/g10.c:3401
+#: g10/g10.c:3407
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�L�Ī� `%s' ����t��k\n"
 
-#: g10/g10.c:3524
+#: g10/g10.c:3530
 msgid "[filename]"
 msgstr "[�ɦW]"
 
-#: g10/g10.c:3528
+#: g10/g10.c:3534
 msgid "Go ahead and type your message ...\n"
 msgstr "�ж}�l��J�p���T�� ...\n"
 
-#: g10/g10.c:3818
+#: g10/g10.c:3824
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "�аO�W�٤@�w�n�ĥΥi�L�X���r�ũΪťաA�åH�@�ӡu=�v�ӵ���\n"
 
-#: g10/g10.c:3826
+#: g10/g10.c:3832
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�ϥΪ̼аO�W�٤@�w�n�t���u@�v�r��\n"
 
-#: g10/g10.c:3836
+#: g10/g10.c:3842
 msgid "a notation value must not use any control characters\n"
 msgstr "�аO�Ȥ@�w����ϥΥ��󪺱���r��\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3876
 msgid "the given certification policy URL is invalid\n"
 msgstr "���w�������ҭ�h URL �L��\n"
 
-#: g10/g10.c:3872
+#: g10/g10.c:3878
 msgid "the given signature policy URL is invalid\n"
 msgstr "���w����h URL �L��\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���w����h URL �L��\n"
@@ -4542,55 +4533,55 @@ msgstr "�L�k�ާ@���}���_�t��k %d\n"
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1113
+#: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d ���O���l�ʥ]�]�w�F����줸\n"
 
-#: g10/passphrase.c:461 g10/passphrase.c:508
+#: g10/passphrase.c:465 g10/passphrase.c:512
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent �b�����q�L�k�ϥ�\n"
 
-#: g10/passphrase.c:469
+#: g10/passphrase.c:473
 msgid "can't set client pid for the agent\n"
 msgstr "�L�k�]�w�N�z�{�������ϥΪ̺� pid\n"
 
-#: g10/passphrase.c:477
+#: g10/passphrase.c:481
 msgid "can't get server read FD for the agent\n"
 msgstr "�L�k���o�N�z�{���һݪ����A��Ū���ɮ״y�z\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:488
 msgid "can't get server write FD for the agent\n"
 msgstr "�L�k���o�N�z�{���һݪ����A���g�J�ɮ״y�z\n"
 
-#: g10/passphrase.c:517
+#: g10/passphrase.c:521
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�Q�ܳy�� GPG_AGENT_INFO �����ܼ�\n"
 
-#: g10/passphrase.c:530
+#: g10/passphrase.c:534
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent ��w���� %d ���Q�䴩\n"
 
-#: g10/passphrase.c:551
+#: g10/passphrase.c:555
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�L�k�s���� `%s' �G %s\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:577
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent ���q�T���D\n"
 
-#: g10/passphrase.c:580 g10/passphrase.c:888 g10/passphrase.c:1000
+#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
 msgid "problem with the agent - disabling agent use\n"
 msgstr "�N�z�{�������D �w ���b���ΥN�z�{��\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1156
+#: g10/passphrase.c:684 g10/passphrase.c:1160
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�D�n���_ ID %08lX)"
 
-#: g10/passphrase.c:694
+#: g10/passphrase.c:698
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4601,40 +4592,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u �줸 %s ID %08lX �����_�A�إߩ� %s%s\n"
 
-#: g10/passphrase.c:719
+#: g10/passphrase.c:723
 msgid "Repeat passphrase\n"
 msgstr "�ЦA��J�@���K�X��\n"
 
-#: g10/passphrase.c:721
+#: g10/passphrase.c:725
 msgid "Enter passphrase\n"
 msgstr "�п�J�K�X��\n"
 
-#: g10/passphrase.c:759
+#: g10/passphrase.c:763
 msgid "passphrase too long\n"
 msgstr "�K�X��Ӫ�\n"
 
-#: g10/passphrase.c:772
+#: g10/passphrase.c:776
 msgid "invalid response from agent\n"
 msgstr "�N�z�{���Ǧ^�L�Ī��^��\n"
 
-#: g10/passphrase.c:787 g10/passphrase.c:882
+#: g10/passphrase.c:791 g10/passphrase.c:886
 msgid "cancelled by user\n"
 msgstr "�ѨϥΪ̨����F\n"
 
-#: g10/passphrase.c:792 g10/passphrase.c:971
+#: g10/passphrase.c:796 g10/passphrase.c:975
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "�N�z�{�������D�G�N�z�{���Ǧ^ 0x%lx\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1207
+#: g10/passphrase.c:1053 g10/passphrase.c:1211
 msgid "can't query password in batchmode\n"
 msgstr "�b�妸�Ҧ����L�k�߰ݱK�X\n"
 
-#: g10/passphrase.c:1054 g10/passphrase.c:1212
+#: g10/passphrase.c:1058 g10/passphrase.c:1216
 msgid "Enter passphrase: "
 msgstr "�п�J�K�X��G "
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1141
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4644,17 +4635,17 @@ msgstr ""
 "�p�ݭn�U�C�ϥΪ̪��K�X��A�ׯ�Ѷ}�p�_�G\n"
 "\""
 
-#: g10/passphrase.c:1143
+#: g10/passphrase.c:1147
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u �줸 %s ID %08lX �����_�A�إߩ� %s"
 
-#: g10/passphrase.c:1152
+#: g10/passphrase.c:1156
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1216
+#: g10/passphrase.c:1220
 msgid "Repeat passphrase: "
 msgstr "�ЦA��J�@���K�X��G "
 
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 23b4c9f1e..05de91f21 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-27  Werner Koch  <[email protected]>
+
+	* mk-w32-dist: Use utf-8 encoding for all MO files.
+
 2004-10-26  Werner Koch  <[email protected]>
 
 	* autogen.sh: Detect the Debian mingw32 package.
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
index 1dd64fb01..daa6d72de 100755
--- a/scripts/mk-w32-dist
+++ b/scripts/mk-w32-dist
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -31,21 +31,28 @@ else
     exit 1
 fi
 
-version=$(sed -n 's/^#[ ]*define[ ][ ]*VERSION[ ][ ]*\"\([0-9.]*\)\"/\1/p' $bindir/config.h)
+if i586-mingw32msvc-strip --version >/dev/null 2>&1 ; then
+   STRIP=i586-mingw32msvc-strip
+else
+   STRIP="mingw32 strip"
+fi
+
+
+version=$(sed -n 's/^#[ ]*define[ ][ ]*VERSION[ ][ ]*\"\([0-9.a-z-]*\)\"/\1/p' $bindir/config.h)
 echo "building version $version"
 
-rm * || true
+rm * 2>/dev/null || true
 
 cp ${bindir}/g10/gpg.exe gpg.exe
-mingw32 strip gpg.exe
+$STRIP gpg.exe
 cp ${bindir}/g10/gpgv.exe gpgv.exe
-mingw32 strip gpgv.exe
-cp ${bindir}/keyserver/gpgkeys_ldap.exe gpgkeys_ldap.exe
-mingw32 strip gpgkeys_ldap.exe
-cp ${bindir}/keyserver/gpgkeys_hkp.exe gpgkeys_hkp.exe
-mingw32 strip gpgkeys_hkp.exe
+$STRIP gpgv.exe
+for name in hkp http finger; do 
+  cp ${bindir}/keyserver/gpgkeys_$name.exe gpgkeys_$name.exe
+  $STRIP gpgkeys_$name.exe
+done
 cp ${bindir}/tools/gpgsplit.exe gpgsplit.exe
-mingw32 strip gpgsplit.exe
+$STRIP gpgsplit.exe
 
 for i in FAQ; do
   cp ${bindir}/doc/$i .
@@ -66,31 +73,24 @@ for i in README.W32 gnupg-w32.reg; do
   todos $i
 done
 
-
+# We must distribute the MO files in UTF-8, the conmversion is done by
+# gpg at runtime.
 for i in ${srcdir}/po/*.po; do
    lang=$(basename $i .po)
+   grep -s $lang ${srcdir}/po/LINGUAS >/dev/null || continue
+
    fromset=`sed -n '/^"Content-Type:/ s/.*charset=\([a-zA-Z0-9_-]*\).*/\1/p' $i`
-   # pl,sk are also cp1250 but the current PO file can't be converted.
-   case $lang in 
-     cs|hu|ro) toset="CP852" ;;  
-     tr) toset="CP1254" ;;   # DOS: CP857
-     el) toset="CP1253" ;;   # same as latin-7?
-     ru|be) toset="CP1251" ;;   # same as latin-7?
-     el|eo|et|ja|pl|sk|zh_TW|zh_CN) toset="" ;;
-      *) toset="CP850" ;;
-   esac
-   if [ -n "$toset" ]; then
-       echo "$lang: converting from $fromset to $toset" >&2 
-       iconv --silent --from-code=$fromset --to-code=$toset < $i | \
-         sed "/^\"Content-Type:/ s/charset=[a-zA-Z0-9_-]*/charset=$toset/" | \
-         msgfmt --output-file=$lang.mo -
-   else
+   case "$fromset" in 
+     utf8|utf-8|UTF8|UTF-8) 
        echo "$lang: keeping $fromset" >&2 
        msgfmt --output-file=$lang.mo $i
-   fi
+       ;;
+     *)
+       echo "$lang: converting from $fromset to utf-8" >&2 
+       iconv --silent --from-code=$fromset --to-code=utf-8 < $i | \
+         sed "/^\"Content-Type:/ s/charset=[a-zA-Z0-9_-]*/charset=utf-8/" | \
+         msgfmt --output-file=$lang.mo -
+       ;;
+   esac
 done
 zip -9 "gnupg-w32cli-${version}.zip" *
-
-
-
-
diff --git a/util/ChangeLog b/util/ChangeLog
index 49c917370..11f1bb4c4 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,5 +1,9 @@
 2004-10-27  Werner Koch  <[email protected]>
 
+	* simple-gettext.c: Removed windows.h.
+	(get_string): On the fly translation from utf-8 to active
+	character set.
+
 	* strgutil.c (load_libiconv) [_WIN32]: new.
 	(set_native_charset) [_WIN32]: Call it here and autodetect the
 	used code page.
@@ -7,7 +11,8 @@
 	iconv_open.
 	(handle_iconv_error): Made this function match iconv_open argumnet
 	ordering.
-	
+	(utf8_to_native): Disable all quoting for DELIM == -1.
+
 2004-10-26  Werner Koch  <[email protected]>
 
 	* strgutil.c (mem2str): Translated comment to English.
diff --git a/util/simple-gettext.c b/util/simple-gettext.c
index 151e7b326..7705b5d1c 100644
--- a/util/simple-gettext.c
+++ b/util/simple-gettext.c
@@ -28,7 +28,7 @@
 #include <config.h>
 #ifdef USE_SIMPLE_GETTEXT
 #if !defined (_WIN32) && !defined (__CYGWIN32__)
-#error This file can only be used udner Windows or Cygwin32
+#error This file can only be used under Windows or Cygwin32
 #endif
 
 #include <stdio.h>
@@ -38,7 +38,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <windows.h>
 #include "types.h"
 #include "util.h"
 
@@ -79,13 +78,22 @@ struct string_desc
 };
 
 
+struct overflow_space_s
+{
+  struct overflow_space_s *next;
+  u32 idx;
+  char d[1];
+};
 
 struct loaded_domain
 {
   char *data;
   int must_swap;
   u32 nstrings;
-/*    char *mapped; */
+  char *mapped;  /* 0 = not yet mapped, 1 = mapped,
+                    2 = mapped to
+                    overflow space */
+  struct overflow_space_s *overflow_space;
   struct string_desc *orig_tab;
   struct string_desc *trans_tab;
   u32 hash_size;
@@ -210,13 +218,13 @@ load_domain( const char *filename )
 	return NULL;
     }
 
-    /* allocate an array to keep track of code page mappings */
-/*      domain->mapped = calloc( 1, domain->nstrings ); */
-/*      if( !domain->mapped ) { */
-/*  	free( data ); */
-/*  	free( domain ); */
-/*  	return NULL; */
-/*      } */
+    /* Allocate an array to keep track of code page mappings. */
+    domain->mapped = calloc( 1, domain->nstrings );
+    if( !domain->mapped ) {
+        free( data );
+        free( domain );
+        return NULL;
+    }
 
     return domain;
 }
@@ -225,7 +233,7 @@ load_domain( const char *filename )
 /****************
  * Set the file used for translations.	Pass a NULL to disable
  * translation.  A new filename may be set at anytime.
- * WARNING: After changing the filename you shoudl not access any data
+ * WARNING: After changing the filename you should not access any data
  *	    retrieved by gettext().
  */
 int
@@ -272,136 +280,69 @@ set_gettext_file( const char *filename )
     }
 
     if( the_domain ) {
+        struct overflow_space_s *os, *os2;
 	free( the_domain->data );
-/*  	free( the_domain->mapped ); */
+  	free( the_domain->mapped );
+        for (os=the_domain->overflow_space; os; os = os2) {
+            os2 = os->next;
+            free (os);
+        }
 	free( the_domain );
 	the_domain = NULL;
     }
     the_domain = domain;
-    return NULL;
+    return 0;
 }
 
 
 static const char*
 get_string( struct loaded_domain *domain, u32 idx )
 {
-    char *p = domain->data + SWAPIT(domain->must_swap,
-				    domain->trans_tab[idx].offset);
-#if 0 /* Mapping is not used any more.  Instead we convert the files when
-         Creating the binary distribution. */
-    if( !domain->mapped[idx] ) {
-	byte *pp;
-
-	domain->mapped[idx] = 1;
-	/* we assume Latin1 -> CP 850 for now */
-	for( pp=p; *pp; pp++ ) {
-	    if( (*pp & 0x80) ) {
-		switch( *pp ) {
-		  /* ISO-8859-1 to IBM-CP-850 */
-		  case 0xa0: *pp = '\xff' ; break;  /* nobreakspace */
-		  case 0xa1: *pp = '\xad' ; break;  /* exclamdown */
-		  case 0xa2: *pp = '\xbd' ; break;  /* cent */
-		  case 0xa3: *pp = '\x9c' ; break;  /* sterling */
-		  case 0xa4: *pp = '\xcf' ; break;  /* currency */
-		  case 0xa5: *pp = '\xbe' ; break;  /* yen */
-		  case 0xa6: *pp = '\xdd' ; break;  /* brokenbar */
-		  case 0xa7: *pp = '\xf5' ; break;  /* section */
-		  case 0xa8: *pp = '\xf9' ; break;  /* diaeresis */
-		  case 0xa9: *pp = '\xb8' ; break;  /* copyright */
-		  case 0xaa: *pp = '\xa6' ; break;  /* ordfeminine */
-		  case 0xab: *pp = '\xae' ; break;  /* guillemotleft */
-		  case 0xac: *pp = '\xaa' ; break;  /* notsign */
-		  case 0xad: *pp = '\xf0' ; break;  /* hyphen */
-		  case 0xae: *pp = '\xa9' ; break;  /* registered */
-		  case 0xaf: *pp = '\xee' ; break;  /* macron */
-		  case 0xb0: *pp = '\xf8' ; break;  /* degree */
-		  case 0xb1: *pp = '\xf1' ; break;  /* plusminus */
-		  case 0xb2: *pp = '\xfd' ; break;  /* twosuperior */
-		  case 0xb3: *pp = '\xfc' ; break;  /* threesuperior */
-		  case 0xb4: *pp = '\xef' ; break;  /* acute */
-		  case 0xb5: *pp = '\xe6' ; break;  /* mu */
-		  case 0xb6: *pp = '\xf4' ; break;  /* paragraph */
-		  case 0xb7: *pp = '\xfa' ; break;  /* periodcentered */
-		  case 0xb8: *pp = '\xf7' ; break;  /* cedilla */
-		  case 0xb9: *pp = '\xfb' ; break;  /* onesuperior */
-		  case 0xba: *pp = '\xa7' ; break;  /* masculine */
-		  case 0xbb: *pp = '\xaf' ; break;  /* guillemotright */
-		  case 0xbc: *pp = '\xac' ; break;  /* onequarter */
-		  case 0xbd: *pp = '\xab' ; break;  /* onehalf */
-		  case 0xbe: *pp = '\xf3' ; break;  /* threequarters */
-		  case 0xbf: *pp = '\xa8' ; break;  /* questiondown */
-		  case 0xc0: *pp = '\xb7' ; break;  /* Agrave */
-		  case 0xc1: *pp = '\xb5' ; break;  /* Aacute */
-		  case 0xc2: *pp = '\xb6' ; break;  /* Acircumflex */
-		  case 0xc3: *pp = '\xc7' ; break;  /* Atilde */
-		  case 0xc4: *pp = '\x8e' ; break;  /* Adiaeresis */
-		  case 0xc5: *pp = '\x8f' ; break;  /* Aring */
-		  case 0xc6: *pp = '\x92' ; break;  /* AE */
-		  case 0xc7: *pp = '\x80' ; break;  /* Ccedilla */
-		  case 0xc8: *pp = '\xd4' ; break;  /* Egrave */
-		  case 0xc9: *pp = '\x90' ; break;  /* Eacute */
-		  case 0xca: *pp = '\xd2' ; break;  /* Ecircumflex */
-		  case 0xcb: *pp = '\xd3' ; break;  /* Ediaeresis */
-		  case 0xcc: *pp = '\xde' ; break;  /* Igrave */
-		  case 0xcd: *pp = '\xd6' ; break;  /* Iacute */
-		  case 0xce: *pp = '\xd7' ; break;  /* Icircumflex */
-		  case 0xcf: *pp = '\xd8' ; break;  /* Idiaeresis */
-		  case 0xd0: *pp = '\xd1' ; break;  /* Eth */
-		  case 0xd1: *pp = '\xa5' ; break;  /* Ntilde */
-		  case 0xd2: *pp = '\xe3' ; break;  /* Ograve */
-		  case 0xd3: *pp = '\xe0' ; break;  /* Oacute */
-		  case 0xd4: *pp = '\xe2' ; break;  /* Ocircumflex */
-		  case 0xd5: *pp = '\xe5' ; break;  /* Otilde */
-		  case 0xd6: *pp = '\x99' ; break;  /* Odiaeresis */
-		  case 0xd7: *pp = '\x9e' ; break;  /* multiply */
-		  case 0xd8: *pp = '\x9d' ; break;  /* Ooblique */
-		  case 0xd9: *pp = '\xeb' ; break;  /* Ugrave */
-		  case 0xda: *pp = '\xe9' ; break;  /* Uacute */
-		  case 0xdb: *pp = '\xea' ; break;  /* Ucircumflex */
-		  case 0xdc: *pp = '\x9a' ; break;  /* Udiaeresis */
-		  case 0xdd: *pp = '\xed' ; break;  /* Yacute */
-		  case 0xde: *pp = '\xe8' ; break;  /* Thorn */
-		  case 0xdf: *pp = '\xe1' ; break;  /* ssharp */
-		  case 0xe0: *pp = '\x85' ; break;  /* agrave */
-		  case 0xe1: *pp = '\xa0' ; break;  /* aacute */
-		  case 0xe2: *pp = '\x83' ; break;  /* acircumflex */
-		  case 0xe3: *pp = '\xc6' ; break;  /* atilde */
-		  case 0xe4: *pp = '\x84' ; break;  /* adiaeresis */
-		  case 0xe5: *pp = '\x86' ; break;  /* aring */
-		  case 0xe6: *pp = '\x91' ; break;  /* ae */
-		  case 0xe7: *pp = '\x87' ; break;  /* ccedilla */
-		  case 0xe8: *pp = '\x8a' ; break;  /* egrave */
-		  case 0xe9: *pp = '\x82' ; break;  /* eacute */
-		  case 0xea: *pp = '\x88' ; break;  /* ecircumflex */
-		  case 0xeb: *pp = '\x89' ; break;  /* ediaeresis */
-		  case 0xec: *pp = '\x8d' ; break;  /* igrave */
-		  case 0xed: *pp = '\xa1' ; break;  /* iacute */
-		  case 0xee: *pp = '\x8c' ; break;  /* icircumflex */
-		  case 0xef: *pp = '\x8b' ; break;  /* idiaeresis */
-		  case 0xf0: *pp = '\xd0' ; break;  /* eth */
-		  case 0xf1: *pp = '\xa4' ; break;  /* ntilde */
-		  case 0xf2: *pp = '\x95' ; break;  /* ograve */
-		  case 0xf3: *pp = '\xa2' ; break;  /* oacute */
-		  case 0xf4: *pp = '\x93' ; break;  /* ocircumflex */
-		  case 0xf5: *pp = '\xe4' ; break;  /* otilde */
-		  case 0xf6: *pp = '\x94' ; break;  /* odiaeresis */
-		  case 0xf7: *pp = '\xf6' ; break;  /* division */
-		  case 0xf8: *pp = '\x9b' ; break;  /* oslash */
-		  case 0xf9: *pp = '\x97' ; break;  /* ugrave */
-		  case 0xfa: *pp = '\xa3' ; break;  /* uacute */
-		  case 0xfb: *pp = '\x96' ; break;  /* ucircumflex */
-		  case 0xfc: *pp = '\x81' ; break;  /* udiaeresis */
-		  case 0xfd: *pp = '\xec' ; break;  /* yacute */
-		  case 0xfe: *pp = '\xe7' ; break;  /* thorn */
-		  case 0xff: *pp = '\x98' ; break;  /* ydiaeresis */
-		  default  :  break;
-		}
-	    }
-	}
+  struct overflow_space_s *os;
+  char *p;
 
+  p = domain->data + SWAPIT(domain->must_swap, domain->trans_tab[idx].offset);
+  if (!domain->mapped[idx]) 
+    {
+      size_t plen, buflen;
+      char *buf;
+      static int debug_hack;
+
+      domain->mapped[idx] = 1;
+
+      plen = strlen (p);
+      buf = utf8_to_native (p, plen, -1);
+      buflen = strlen (buf);
+      if (buflen <= plen && (++debug_hack %3))
+        strcpy (p, buf);
+      else
+        {
+          /* There is not enough space for the translation - store it
+             in the overflow_space else and mark that in the mapped
+             array.  Because we expect that this won't happen too
+             often, we use a simple linked list.  */
+          os = malloc (sizeof *os + buflen);
+          if (os)
+            {
+              os->idx = idx;
+              strcpy (os->d, buf);
+              os->next = domain->overflow_space;
+              domain->overflow_space = os;
+              p = os->d;
+            }
+          else
+            p = "ERROR in GETTEXT MALLOC";
+        }
+      m_free (buf);
+    }
+  else if (domain->mapped[idx] == 2) 
+    { /* We need to get the string from the overflow_space. */
+      for (os=domain->overflow_space; os; os = os->next)
+        if (os->idx == idx)
+          return (const char*)os->d;
+      p = "ERROR in GETTEXT\n";
     }
-#endif /* unused code */
-    return (const char*)p;
+  return (const char*)p;
 }
 
 
diff --git a/util/strgutil.c b/util/strgutil.c
index 5b1182e0d..67dafcee5 100644
--- a/util/strgutil.c
+++ b/util/strgutil.c
@@ -480,10 +480,17 @@ set_native_charset( const char *newset )
 #ifdef _WIN32
         static char codepage[30];
 
-        sprintf (codepage, "CP%u", (unsigned int)GetACP ());
-
-        /* If it is the Windows name for Latin-1 we use the
-         * standard name instead to avoid loading of iconv.dll.  */
+        /* We are a console program thus we need to use the
+           GetConsoleOutputCP fucntion and not the the GetACP which
+           would give the codepage for a GUI program.  Note this is
+           not a bulletproof detection because GetConsoleCP might
+           retrun a different one for console input.  Not sure how to
+           cope with that.  */
+        sprintf (codepage, "CP%u", (unsigned int)GetConsoleOutputCP ());
+        /* If it is the Windows name for Latin-1 we use the standard
+           name instead to avoid loading of iconv.dll.  Unfortunately
+           it is often CP850 and we don't have a custom translation
+           for it. */
         if (!strcmp (codepage, "CP1252"))
             newset = "iso-8859-1";
         else
@@ -688,8 +695,9 @@ native_to_utf8( const char *string )
  * Convert string, which is in UTF8 to native encoding.  illegal
  * encodings by some "\xnn" and quote all control characters. A
  * character with value DELIM will always be quoted, it must be a
- * vanilla ASCII character.  
-  */
+ * vanilla ASCII character.  A DELIM value of -1 is special: it disables 
+ * all quoting of control characters.
+ */
 char *
 utf8_to_native( const char *string, size_t length, int delim )
 {
@@ -722,8 +730,9 @@ utf8_to_native( const char *string, size_t length, int delim )
 	    }
 	    if( !nleft ) {
 		if( !(*s & 0x80) ) { /* plain ascii */
-		    if( *s < 0x20 || *s == 0x7f || *s == delim ||
-			(delim && *s=='\\')) {
+		    if( delim != -1 
+                        && (*s < 0x20 || *s == 0x7f || *s == delim
+                            || (delim && *s=='\\'))) {
 			n++;
 			if( p )
 			    *p++ = '\\';