Fixed memory allocation bug and typos.

34 files changed, 2784 insertions, 2984 deletions

diff --git a/NEWS b/NEWS
index 6a95dac72..25a1e003c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 Noteworthy changes in version 1.4.5
 ------------------------------------------------
 
+    * Fixed 2 more memory allocation attacks.
+
 
 Noteworthy changes in version 1.4.4 (2006-06-25)
 ------------------------------------------------
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 2765ec94a..3ab05117f 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,15 @@
+2006-07-26  Werner Koch  <[email protected]>
+
+	* keygen.c (gen_card_key_with_backup): Initialize sk_{un}protected.
+
+	* import.c (import): Init KEYBLOCK.
+
+	* pkclist.c (edit_ownertrust): Intialize trust to avoid ggc
+	warning.
+
+	* parse-packet.c (parse_comment): Cap comments at 65k.
+	(parse_gpg_control): Skip too large control packets.
+
 2006-06-28  David Shaw  <[email protected]>
 
 	* keydb.h, pkclist.c (select_algo_from_prefs, algo_available):
diff --git a/g10/import.c b/g10/import.c
index 6e581cfab..e2ad0e314 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -243,7 +243,7 @@ import( IOBUF inp, const char* fname,struct stats_s *stats,
 	unsigned char **fpr,size_t *fpr_len,unsigned int options )
 {
     PACKET *pending_pkt = NULL;
-    KBNODE keyblock;
+    KBNODE keyblock = NULL;
     int rc = 0;
 
     getkey_disable_caches();
@@ -566,10 +566,8 @@ check_prefs_warning(PKT_public_key *pk)
   log_info(_("WARNING: key %s contains preferences for unavailable\n"),
             keystr_from_pk(pk));
   /* TRANSLATORS: This string is belongs to the previous one.  They are
-     only split up to allow printing of a common prefix. The
-     check_prefs_warning tag is a hack to make this string unique.  */
-  log_info(_("         algorithms on these user IDs:\n"
-             "\0" "check_prefs_warning")); 
+     only split up to allow printing of a common prefix. */
+  log_info(_("         algorithms on these user IDs:\n"));
 }
 
 static void
diff --git a/g10/keygen.c b/g10/keygen.c
index fdc5ea2b2..620274aef 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -3495,6 +3495,8 @@ gen_card_key_with_backup (int algo, int keyno, int is_primary,
   size_t n;
   int i;
 
+  sk_unprotected = NULL;
+  sk_protected = NULL;
   rc = generate_raw_key (algo, 1024, make_timestamp (),
                          &sk_unprotected, &sk_protected);
   if (rc)
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 29565df07..363ade99f 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -2088,6 +2088,16 @@ parse_comment( IOBUF inp, int pkttype, unsigned long pktlen, PACKET *packet )
 {
     byte *p;
 
+    /* Cap comment packet at a reasonable value to avoid an integer
+       overflow in the malloc below.  Comment packets are actually not
+       anymore define my OpenPGP and we even stopped to use our
+       private comment packet. */
+    if (pktlen>65536)
+      {
+	log_error ("packet(%d) too large\n", pkttype);
+	iobuf_skip_rest (inp, pktlen, 0);
+	return G10ERR_INVALID_PACKET;
+      }
     packet->pkt.comment = xmalloc(sizeof *packet->pkt.comment + pktlen - 1);
     packet->pkt.comment->len = pktlen;
     p = packet->pkt.comment->data;
@@ -2097,7 +2107,7 @@ parse_comment( IOBUF inp, int pkttype, unsigned long pktlen, PACKET *packet )
     if( list_mode ) {
 	int n = packet->pkt.comment->len;
 	fprintf (listfp, ":%scomment packet: \"", pkttype == PKT_OLD_COMMENT?
-					 "OpenPGP draft " : "" );
+					 "OpenPGP draft " : "GnuPG " );
 	for(p=packet->pkt.comment->data; n; p++, n-- ) {
 	    if( *p >= ' ' && *p <= 'z' )
 		putc (*p, listfp);
@@ -2161,6 +2171,7 @@ parse_plaintext( IOBUF inp, int pkttype, unsigned long pktlen,
     }
     mode = iobuf_get_noeof(inp); if( pktlen ) pktlen--;
     namelen = iobuf_get_noeof(inp); if( pktlen ) pktlen--;
+    /* Note that namelen will never exceeds 255 byte. */
     pt = pkt->pkt.plaintext = xmalloc(sizeof *pkt->pkt.plaintext + namelen -1);
     pt->new_ctb = new_ctb;
     pt->mode = mode;
@@ -2311,10 +2322,10 @@ parse_mdc( IOBUF inp, int pkttype, unsigned long pktlen,
 
 
 /*
- * This packet is internally generated by PGG (by armor.c) to
+ * This packet is internally generated by GPG (by armor.c) to
  * transfer some information to the lower layer.  To make sure that
  * this packet is really a GPG faked one and not one comming from outside,
- * we first check that tehre is a unique tag in it.
+ * we first check that there is a unique tag in it.
  * The format of such a control packet is:
  *   n byte  session marker
  *   1 byte  control type CTRLPKT_xxxxx
@@ -2340,6 +2351,9 @@ parse_gpg_control( IOBUF inp, int pkttype,
 	if ( sesmark[i] != iobuf_get_noeof(inp) )
             goto skipit;
     }
+    if (pktlen > 4096)
+      goto skipit; /* Definitely too large.  We skip it to avoid an
+                      overflow in the malloc. */
     if ( list_mode )
         puts ("- gpg control packet");
 
diff --git a/g10/pkclist.c b/g10/pkclist.c
index cae60b209..4c0ffd779 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -363,7 +363,7 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
 int
 edit_ownertrust (PKT_public_key *pk, int mode )
 {
-  unsigned int trust;
+  unsigned int trust = 0;  /* Needs to be initialized to avoid gcc warning. */
   int no_help = 0;
 
   for(;;)
diff --git a/include/iobuf.h b/include/iobuf.h
index b6e5303da..0e3584c18 100644
--- a/include/iobuf.h
+++ b/include/iobuf.h
@@ -135,10 +135,10 @@ void iobuf_set_partial_block_mode( IOBUF a, size_t len );
 
 int iobuf_translate_file_handle ( int fd, int for_write );
 
-/* get a byte form the iobuf; must check for eof prior to this function
- * this function returns values in the range 0 .. 255 or -1 to indicate EOF
+/* Get a byte form the iobuf; must check for eof prior to this function.
+ * This function returns values in the range 0 .. 255 or -1 to indicate EOF
  * iobuf_get_noeof() does not return -1 to indicate EOF, but masks the
- * returned value to be in the range 0 ..255.
+ * returned value to be in the range 0..255.
  */
 #define iobuf_get(a)  \
      (	((a)->nofast || (a)->d.start >= (a)->d.len )?  \
diff --git a/po/ChangeLog b/po/ChangeLog
index ff4d4f513..aefcc0661 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,7 @@
 2006-07-03  Werner Koch  <[email protected]>
 
+	* zh_TW.po: Updated, albeit a copy from last year.
+
 	* zh_CN.po: Updated.
 
 2006-06-27  Werner Koch  <[email protected]>
diff --git a/po/be.po b/po/be.po
index 72487d485..ca77d5348 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+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"
@@ -43,8 +43,8 @@ msgstr "запіс у stdout\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -79,7 +79,7 @@ msgstr ""
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
@@ -726,7 +726,7 @@ msgstr ""
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -767,7 +767,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
@@ -786,7 +786,7 @@ msgstr "збой падпісаньня: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr ""
@@ -811,7 +811,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2183,328 +2183,332 @@ msgstr ""
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+msgid "         algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:604
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr ""
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
@@ -2786,7 +2790,7 @@ msgid "Really sign? (y/N) "
 msgstr ""
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -3940,17 +3944,17 @@ msgstr ""
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -5277,39 +5281,35 @@ msgid ""
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA патрабуе выкарыстаньня 160-і бітавага хэш-альгарытму\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -6001,6 +6001,9 @@ msgstr "дзеяньне немагчымае без распачатае бяс
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA патрабуе выкарыстаньня 160-і бітавага хэш-альгарытму\n"
+
 #, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr "збой падпісаньня: %s\n"
diff --git a/po/ca.po b/po/ca.po
index 77fc0813a..d25db8d5d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -63,8 +63,8 @@ msgstr "s'està escrivint la clau secreta a «%s»\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -100,7 +100,7 @@ msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
@@ -779,7 +779,7 @@ msgstr "--output no funciona per a aquesta ordre\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -824,7 +824,7 @@ msgstr "hi ha una clau secreta per a la clau pública «%s»!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
@@ -843,7 +843,7 @@ msgstr "Ha fallat el procés de signatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVÍS: «%s» és un fitxer buit\n"
@@ -872,7 +872,7 @@ msgid ""
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2403,195 +2403,200 @@ msgstr " claus privades llegides: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "Heu signat els següents ID d'usuari:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no és vàlid\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "açò pot ser causat per l'absència d'autosignatura\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clau %08lX: no correspon a la nostra còpia\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: «%s» 1 signatura nova\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: «%s» 1 subclau nova\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: «%s» %d subclaus noves\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: «%s» no ha estat modificada\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clau %08lX: ja es troba en l'anell privat\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2601,22 +2606,22 @@ msgstr ""
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -2624,126 +2629,126 @@ msgstr ""
 "s»\n"
 "\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocació no vàlida\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clau %08lX: el certificat de revocació és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació %"
 "08lX\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
@@ -3070,7 +3075,7 @@ msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
@@ -4354,17 +4359,17 @@ msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -5802,43 +5807,39 @@ msgstr ""
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatura de: «%s»\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu fer signatures separades amb claus d'estil PGP 2.x mentre esteu "
 "en mode --pgp2\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
@@ -6579,9 +6580,8 @@ msgstr "l'operació no és possible sense memòria segura inicialitzada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Heu signat els següents ID d'usuari:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/cs.po b/po/cs.po
index 9eb54ff6a..00c5acdeb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+0200\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -43,8 +43,8 @@ msgstr "zapisuji tajn� kl�� do `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -79,7 +79,7 @@ msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
@@ -722,7 +722,7 @@ msgstr "--output pro tento p��kaz nen� platn�\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -763,7 +763,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou�ijte nejprve parametr \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
@@ -782,7 +782,7 @@ msgstr "pou�it� �ifry: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
@@ -809,7 +809,7 @@ msgid ""
 msgstr ""
 "VAROV�N�: vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2322,333 +2322,338 @@ msgstr " odstran�n� u�ivatelsk� ID: %lu\n"
 
 #: g10/import.c:566
 #, fuzzy, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "VAROV�N�: kl�� %s obsahuje preference pro algoritmy,\n"
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "kter� nesjou k dispozici. T�k� se to t�chto user ID:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preference pro �ifrovac� algortimus %s\n"
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preference pro podepisovac� algoritmus %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preference pro komprima�n� algoritmus %s\n"
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "velmi doporu�ujeme aktualiaci nastaven� va�ich preferenc� a\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "distribuci tohoto kl��e aby jste p�ede�el probl�m�m s neshodou algoritm�\n"
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "nelze aktualizovat preference s: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kl�� %s: PKS po�kozen� podkl��e opraveno\n"
 
 # c-format
-#: g10/import.c:761
+#: g10/import.c:764
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kl�� %s: p�ijat id u�ivatele \"%s\",kter� nen� podeps�n j�m sam�m\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kl�� %s: chyb� platn� identifik�tor u�ivatele\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to b�t zp�sobeno chyb�j�c�m podpisem kl��e j�m sam�m\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kl�� %s: ve�ejn� kl�� nenalezen: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kl�� %s: nov� kl�� - p�esko�en\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kl�� %s: ve�ejn� kl�� \"%s\" importov�n\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kl�� %s: neodpov�d� na�� kopii\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kl�� %s: nemohu naj�t origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kl�� %s: nemohu ��st origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kl�� %s: \"%s\" 1 nov� identifik�tor u�ivatele\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podpis�\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podkl��\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podkl���\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kl�� %s: \"%s\" beze zm�n\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kl�� %s: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 msgid "importing secret keys not allowed\n"
 msgstr "import tajn�ch kl��� nen� povolen\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kl�� %s: tajn� kl�� importov�n\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kl�� %s: je ji� v souboru tajn�ch kl���\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kl�� %s: nenalezen tajn� kl��: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "kl�� %s: chyb� ve�ejn� kl�� - nemohu aplikovat revoka�n� certifik�t\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kl�� %s: \"%s\" revoka�n� certifik�t importov�n\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kl�� %s: neexistuje id u�ivatele pro podpis\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id  \"%s"
 "\"\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kl�� %s neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kl�� %s: neexistuje podkl�� pro v�z�n� kl���\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kl�� %s: neplatn� vazba podkl��e\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� vazba podkl��e\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci kl��e\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kl�� %s: neplatn� revoka�n� podkl��\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� revokace podkl��e\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kl�� %s: p�esko�en identifik�tor u�ivatele \"%s\"\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kl�� %s: podkl�� p�esko�en\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kl�� %s: podpis nen� exportovateln� (t��da %02X) - p�esko�eno\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kl�� %s: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kl�� %s: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROV�N�: kl�� %s m��e b�t revokov�n: zkou��m z�skat revoka�n� kl�� %s\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VAROV�N�: kl�� %s m��e b�t revokov�n: revoka�n� kl�� %s nenalezen.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kl�� %s: \"%s\" p�id�n revoka�n� certifik�t\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kl�� %s: podpis kl��e j�m sam�m (direct key signature) p�id�n\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "POZN�MKA: S/N kl��e neodpov�d� S/N karty\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "POZN�MKA: prim�rn� kl�� je online a je ulo�en na kart�\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "POZN�MKA: sekund�rn� kl�� je online a je ulo�en na kart�\n"
 
@@ -2954,7 +2959,7 @@ msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
@@ -4150,17 +4155,17 @@ msgstr "POZN�MKA: vytvo�en� podkl��e pro kl��e v3 nen� v souladu s OpenPGP\n"
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "ulo�en� kl��e na kartu se nezda�ilo: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: z�loha kl��e z karty ulo�ena do `%s'\n"
@@ -5524,27 +5529,23 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL preferovan�ho keyservery (p��li� dlouh�). "
 "Pou�ity neexpandovan�.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA po�aduje pou�it� 160-ti bitov�ho hashovac�ho algoritmu\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytvo�it pouze odd�len� podpis (detach-sign)s kl��i "
 "form�tu PGP-2.x\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5552,16 +5553,16 @@ msgstr ""
 "VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et jen �iteln� podpisy s kl��i form�tu PGP-2.x\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
@@ -6258,8 +6259,8 @@ msgstr "prov�st operaci nen� mo�n� bez inicializovan� bezpe�n� pam�ti\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravd�podobn� jste pro tento �kol pou�ili nespr�vn� program)\n"
 
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "kter� nesjou k dispozici. T�k� se to t�chto user ID:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA po�aduje pou�it� 160-ti bitov�ho hashovac�ho algoritmu\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/da.po b/po/da.po
index 9a9f9f9f7..2af49232e 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+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"
@@ -44,8 +44,8 @@ msgstr "skriver hemmeligt certifikat til '%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -80,7 +80,7 @@ msgstr ""
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
@@ -752,7 +752,7 @@ msgstr ""
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -793,7 +793,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -812,7 +812,7 @@ msgstr "signering fejlede: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
@@ -837,7 +837,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2238,329 +2238,334 @@ msgstr " hemmelige n�gler l�st: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "      nye bruger-id'er: %lu\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke lokalisere original n�gleblok: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
@@ -2849,7 +2854,7 @@ msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
@@ -4053,17 +4058,17 @@ msgstr ""
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
@@ -5430,39 +5435,35 @@ msgid ""
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr ""
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index ca1c65268..a632a30d4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-06-25 13:35+0200\n"
-"PO-Revision-Date: 2006-05-12 12:13+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+0200\n"
+"PO-Revision-Date: 2006-06-28 20:54+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -43,8 +43,8 @@ msgstr "es wird auf die Sperre `%s' gewartet...\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -80,7 +80,7 @@ msgstr "Hinweis: 'random_seed'-Datei bleibt unver�ndert\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
@@ -726,7 +726,7 @@ msgstr "--output funktioniert nicht bei diesem Kommando\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schl�ssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -769,7 +769,7 @@ msgstr ""
 "Verwenden Sie zun�chst das Kommando \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@ -790,7 +790,7 @@ msgstr "benutze Cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
@@ -821,7 +821,7 @@ msgstr ""
 "WARNUNG: Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %"
 "s (%d) verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2339,349 +2339,354 @@ msgstr "             gelesene geheime Schl�ssel: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
-msgstr ""
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr "WARNING: Schl�ssel %s hat Einstellungen zu nicht verf�gbaren\n"
+
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "         Algorithmen f�r diese User IDs:\n"
 
-#: g10/import.c:604
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, fuzzy, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "Schl�ssel %s: Keine User-ID\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "Schl�ssel %s: PKS Unterschl�sseldefekt repariert\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "Schl�ssel %s: Nicht eigenbeglaubigte User-ID `%s' �bernommen\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies k�nnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel \"%s\" importiert\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: der lokale originale Schl�sselblocks wurde nicht gefunden: %"
 "s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue User-ID\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Unterschl�ssel\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "Schl�ssel %08lX: \"%s\" Nicht ge�ndert\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: geheimer Schl�ssel mit ung�ltiger Verschl�sselung %d - "
 "�bersprungen\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schl�sselbund: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schl�ssel %08lX: Kein �ffentlicher Schl�ssel - der Schl�sselwiderruf kann "
 "nicht angebracht werden\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren f�r User-ID \"%s"
 "\"\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung f�r User-ID \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselanbindungs-"
 "Beglaubigung\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung entfernt\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselwiderruf-"
 "Beglaubigung\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "Schl�ssel %08lX: Mehrfacher Unterschl�ssel-Widerruf-Beglaubigung entfernt\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht exportf�hige Unterschrift (Klasse %02x) - �bergangen\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - �bergangen\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: hole Widerrufschl�ssel %08lX\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: Widerrufschl�ssel %08lX ist "
 "nicht vorhanden\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�ffentliche Schl�ssel pa�t nicht zum geheimen Schl�ssel!\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
@@ -3018,7 +3023,7 @@ msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -4266,17 +4271,17 @@ msgstr "HINWEIS: Unterschl�ssel f�r v3-Schl�ssen sind nicht OpenPGP-konform\n"
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
@@ -4608,7 +4613,7 @@ msgstr "verschl�sselt mit %s Schl�ssel, ID %s\n"
 #: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
-msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
+msgstr "Entschl�sselung mit Public-Key-Verfahren fehlgeschlagen: %s\n"
 
 #: g10/mainproc.c:508
 #, c-format
@@ -5708,44 +5713,40 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA ben�tigt einen 160-bit Hash Algorithmus\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Pr�fung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s Unterschrift von: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln eine abgetrennte "
 "Unterschrift erzeugt werden\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwingen des Hashverfahrens %s (%d) verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie Klartextunterschriften nur mit PGP-2.x-artigen "
 "Schl�ssel machen\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschl�sselung wird verwendet\n"
@@ -6461,9 +6462,8 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(m�glicherweise haben Sie das falsche Programm f�r diese Aufgabe benutzt)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Sie haben folgende User-IDs beglaubigt:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA ben�tigt einen 160-bit Hash Algorithmus\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/el.po b/po/el.po
index a42a5deab..e7df056df 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+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"
@@ -42,8 +42,8 @@ msgstr "������� ��� �������� �������� ��� `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -80,7 +80,7 @@ msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
@@ -751,7 +751,7 @@ msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -795,7 +795,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -814,7 +814,7 @@ msgstr "����� ��� ���������������: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
@@ -845,7 +845,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2358,340 +2358,345 @@ msgstr "      ����������� ������� �������: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "����� ��������� ���� �� user ID:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "������ %08lX: ��� ���� ������ user ID\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "������ %08lX:  ��� ������ - ������������\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "������ %08lX: \"%s\" ����������\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "������ %08lX: ��� ��� ������� ����������\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
 "���������\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
 "s\"\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "������ %08lX: ������������ user ID '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "������ %08lX: ������������ ���������\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
@@ -3021,7 +3026,7 @@ msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
@@ -4280,17 +4285,17 @@ msgstr ""
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
@@ -5694,27 +5699,23 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "� DSA ������� �� ����� ���� 160 bit ���������� hash\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ����������-���������� �� ������� ����� PGP 2.x ���� ��\n"
 "--pgp2 ���������\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5722,16 +5723,16 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ���������� ������ �� ������� ����� PGP 2.x �� ��������� --pgp2\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
@@ -6438,9 +6439,8 @@ msgstr "� ���������� ��� ����� ������ ����� �������������� ������ �����\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "����� ��������� ���� �� user ID:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "� DSA ������� �� ����� ���� 160 bit ���������� hash\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/eo.po b/po/eo.po
index 3f8bdbe0f..ce4f00267 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+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"
@@ -42,8 +42,8 @@ msgstr "skribas sekretan �losilon al '%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -79,7 +79,7 @@ msgstr "noto: dosiero random_seed ne aktualigita\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
@@ -751,7 +751,7 @@ msgstr "--output ne funkcias por �i tiu komando\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -794,7 +794,7 @@ msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -813,7 +813,7 @@ msgstr "subskribado malsukcesis: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@ -838,7 +838,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2323,330 +2323,335 @@ msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
@@ -2989,7 +2994,7 @@ msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -4234,17 +4239,17 @@ msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
@@ -5634,41 +5639,37 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr ""
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 #, fuzzy
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "eblas klartekste subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
@@ -6372,10 +6373,6 @@ msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
-
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 #~ msgstr ""
diff --git a/po/es.po b/po/es.po
index 91d23bf86..93dae4659 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+0200\n"
 "PO-Revision-Date: 2005-03-25 16:50+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -46,8 +46,8 @@ msgstr "escribiendo clave privada en `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -88,7 +88,7 @@ msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
@@ -732,7 +732,7 @@ msgstr "--output no funciona con esta orden\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -772,7 +772,7 @@ msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
@@ -791,7 +791,7 @@ msgstr "usando cifrado %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
@@ -819,7 +819,7 @@ msgstr ""
 "AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2324,334 +2324,339 @@ msgstr "     claves secretas le�das: %lu\n"
 
 #: g10/import.c:566
 #, fuzzy, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "AVISO: la clave %s contiene preferencias para no disponible\n"
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "algoritmos en estos IDs de usuarios:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": algoritmo de cifrado preferido %s\n"
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": algoritmo de resumen preferido %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": algoritmo de compresi�n preferido %s\n"
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "re-dustribuya esta clave para evitar potenciales problemas de\n"
 "diferencias en los algoritmos.\n"
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clave %s: reparada la subclave PKS corrompida\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clave %s: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clave %s: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clave %s: clave nueva - omitida\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clave %s: clave p�blica \"%s\" importada\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clave %s: no coincide con nuestra copia\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clave %s: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clave %s: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %s: \"%s\" sin cambios\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %s: clave secreta importada\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clave %s: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clave %s: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %s: falta la clave p�blica - imposible emplear el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %s: certificado de revocaci�n inv�lido: %s - rechazado\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clave %s: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible para ID \"%s\"\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clave %s: autofirma inv�lida para el id \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clave %s: no hay subclave que unir a la clave\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clave %s: uni�n de subclave inv�lida\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clave %s: no hay subclave para la revocaci�n de clave\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clave %s: revocaci�n de subclave inv�lida\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clave %s: omitido ID de usuario \"%s\"\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %s: subclave omitida\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clave %s: certificado de revocaci�n en lugar equivocado - omitido\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %s: certificado de revocaci�n no valido: %s - omitido\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: recuperando clave de revocaci�n %s\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: falta clave de revocaci�n %s.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %s: firma directa de clave a�adida\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTA: un S/N de la clave no coincide con la de la tarjeta\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTA: clave primaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTA: clave secundaria en l�nea y almacenada en la tarjeta\n"
 
@@ -2953,7 +2958,7 @@ msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -4149,17 +4154,17 @@ msgstr "NOTA: crear subclaves para claves V3 no sigue el est�ndar OpenPGP\n"
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no se puede crear fichero de respaldo `%s': %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
@@ -5529,27 +5534,23 @@ msgstr ""
 "AVISO: no puedo expandir el %% de la URL del servidor de claves\n"
 "preferido. Se usa sin expandir.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s firma de: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s�lo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --"
 "pgp2\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5557,15 +5558,15 @@ msgstr ""
 "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s�lo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
@@ -6294,8 +6295,8 @@ msgstr "operaci�n imposible sin memoria segura inicializada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "algoritmos en estos IDs de usuarios:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/et.po b/po/et.po
index f113906e8..8d9e5fd04 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+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"
@@ -42,8 +42,8 @@ msgstr "kirjutan salajase v�tme faili `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -78,7 +78,7 @@ msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
@@ -748,7 +748,7 @@ msgstr "v�ti --output ei t��ta selle k�suga\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -791,7 +791,7 @@ msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -810,7 +810,7 @@ msgstr "kasutan �iffrit %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
@@ -837,7 +837,7 @@ msgid ""
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2323,334 +2323,339 @@ msgstr " loetud salajasi v�tmeid: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
@@ -2976,7 +2981,7 @@ msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
@@ -4214,17 +4219,17 @@ msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
@@ -5603,42 +5608,38 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
@@ -6341,9 +6342,8 @@ msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/fi.po b/po/fi.po
index 41943fcf3..94e3908ec 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+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"
@@ -58,8 +58,8 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -95,7 +95,7 @@ msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
@@ -769,7 +769,7 @@ msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -812,7 +812,7 @@ msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -831,7 +831,7 @@ msgstr "käytetään salakirjoitusalgoritmia %s\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
@@ -857,7 +857,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2354,337 +2354,342 @@ msgstr "      luettuja salaisia avaimia: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "avain %08lX: avain on jo avainrenkaassa\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "avain %08lX: salaista avainta ei löydy: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
 "ei saatavilla.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
@@ -3013,7 +3018,7 @@ msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
@@ -4261,17 +4266,17 @@ msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -5678,44 +5683,40 @@ msgstr ""
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "voit tehdä erillisiä allekirjoituksia PGP 2.x -muodon avaimilla \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x -muodon avaimilla voi allekirjoittaa tekstimuotoon \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
@@ -6420,9 +6421,8 @@ msgstr "toiminto on mahdollinen vain, jos suojattu muisti alustetaan\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/fr.po b/po/fr.po
index 67f5f3936..b3495d0d5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+0200\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -47,8 +47,8 @@ msgstr "�criture de la cl� secr�te dans `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -85,7 +85,7 @@ msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
@@ -740,7 +740,7 @@ msgstr "--output n'est pas compatible avec cette commande\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -780,7 +780,7 @@ msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
@@ -800,7 +800,7 @@ msgstr "utilisation de l'algorithme de chiffrement %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
@@ -831,7 +831,7 @@ msgstr ""
 "AVERTISSEMENT: forcer le chiffrement sym�trique %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2374,341 +2374,346 @@ msgstr "   noms d'utilisateur nettoy�s: %lu\n"
 
 #: g10/import.c:566
 #, fuzzy, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "AVERTISSEMENT: la cl� %s contient des pr�ferences pour des\n"
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "algorithmes indisponibles sur ces noms d'utilisateurs:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de hachage %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de compression %s\n"
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "il est fortement sugg�r� de mettre � jour vos pr�f�rences et\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "redistribuer cette cl� pour �viter les probl�mes potentiels qui seraient\n"
 "caus�s par des algorithmes non appropri�s\n"
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "vous pouvez mettre � jour vos pr�f�rences avec: \n"
 "gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cl� %s: corruption de sous-cl� PKS r�par�e\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur non auto-sign� accept� � %s �\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cl� %s: cl� publique non trouv�e: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cl� %s: cl� publique � %s � import�e\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cl� %s: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cl� %s: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cl� %s: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cl� %s: � %s � un nouvel utilisateur\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cl� %s: � %s � une nouvelle signature\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cl� %s: � %s � %d nouvelles signatures\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cl� %s: � %s � une nouvelle sous-cl�\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cl� %s: � %s � %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cl� %s: � %s � %d signature nettoy�e\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cl� %s: � %s � %d nom d'utilisateur nettoy�\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cl� %s: � %s � %d noms d'utilisateur nettoy�s\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cl� %s: � %s � n'a pas chang�\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "cl� %s: cl� secr�te avec le chiffrement invalide %d - non prise\n"
 "en compte\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 msgid "importing secret keys not allowed\n"
 msgstr "il est interdit d'importer les cl� secr�tes\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cl� %s: cl� secr�te import�e\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cl� %s: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cl� %s: cl� secr�te non trouv�e: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %s: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cl� %s: � %s � certificat de r�vocation import�\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cl� %s: pas de nom d'utilisateur pour la signature\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cl� %s: algorithme de cl� publique non support� avec le nom\n"
 "d'utilisateur � %s �\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cl� %s: auto-signature du nom d'utilisateur � %s � invalide\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cl� %s: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cl� %s: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cl� %s: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cl� %s: supression de liaisons multiples avec des sous-cl�s\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cl� %s: pas de sous-cl� pour r�voquer la cl�\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cl� %s: r�vocation de sous-cl� invalide\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cl� %s: suppression de la r�vocation de sous-cl�s multiples\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur � %s � non pris en compte\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cl� %s: sous-cl� non prise en compte\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cl� %s: signature non exportable (classe 0x%02X) - ignor�e\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %s: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cl� %s: nom d'utilisateur en double d�tect� - fusion accomplie\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: recherche de\n"
 "la cl� de r�vocation %s\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: la cl� de\n"
 "r�vocation %s est absente.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cl� %s: certificat de r�vocation � %s � ajout�\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cl� %s: ajout de la signature de cl� directe\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTE: le num�ro de s�rie d'une cl� n'est pas celui de la carte\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTE: la cl� primaire est en ligne et stock�e sur la carte\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTE: la cl� secondaire est en ligne et stock�e sur la carte\n"
 
@@ -3017,7 +3022,7 @@ msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
@@ -4257,17 +4262,17 @@ msgstr ""
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "le stockage de la cl� dans la carte a �chou�: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
@@ -5687,27 +5692,23 @@ msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %% de l'URL\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA n�cessite l'utilisation d'un algorithme de hachage de 160 bits\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature de: � %s �\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible g�n�rer une signature d�tach�e avec des cl�s de\n"
 "style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5715,17 +5716,17 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de hachage %s (%d) entre en\n"
 "d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature en texte clair avec des cl�s\n"
 "de style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
@@ -6441,8 +6442,9 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-�tre utilis� un programme non adapt� � cette fin)\n"
 
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "algorithmes indisponibles sur ces noms d'utilisateurs:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr ""
+#~ "DSA n�cessite l'utilisation d'un algorithme de hachage de 160 bits\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/gl.po b/po/gl.po
index 985e18b7f..1e521bba7 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+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"
@@ -42,8 +42,8 @@ msgstr "gravando a chave secreta en `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -78,7 +78,7 @@ msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
@@ -755,7 +755,7 @@ msgstr "--output non traballa con este comando\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -799,7 +799,7 @@ msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -818,7 +818,7 @@ msgstr "fallou a sinatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
@@ -846,7 +846,7 @@ msgid ""
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2339,345 +2339,350 @@ msgstr "chaves secretas lidas: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "Asinou estes IDs de usuario: \n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica non atopada: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: non hai chave p�blica - non se pode aplica-lo\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocaci�n incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
 "\"\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: non hai unha sub-chave para a revocaci�n da chave\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n no lugar err�neo - omitido\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n incorrecto: %s - omitido\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
@@ -3001,7 +3006,7 @@ msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
@@ -4264,17 +4269,17 @@ msgstr "NOTA: a creaci�n de subchaves para chaves v3 non cumpre OpenPGP\n"
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
@@ -5674,42 +5679,38 @@ msgid ""
 "unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s� pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --"
 "pgp2\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
@@ -6418,9 +6419,8 @@ msgstr "a operaci�n non � posible sen memoria inicializada como segura\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Asinou estes IDs de usuario: \n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/hu.po b/po/hu.po
index 3079a36bb..b21ad9042 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+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"
@@ -42,8 +42,8 @@ msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -79,7 +79,7 @@ msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -750,7 +750,7 @@ msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -793,7 +793,7 @@ msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -812,7 +812,7 @@ msgstr "%s rejtjelez�st haszn�lok.\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
@@ -838,7 +838,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2331,337 +2331,342 @@ msgstr "   olvasott titkos kulcsok: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "%08lX kulcs: Nem egyezik a mi m�solatunkkal!\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tal�lom az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "%08lX kulcs: Titkos kulcs �rv�nytelen (%d) rejtjelez�vel - kihagytam.\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "%08lX kulcs: M�r szerepel a titkoskulcs-karik�n.\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%08lX kulcs: Titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "%08lX kulcs: Nincs nyilv�nos kulcs - nem tudok visszavonni.\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - visszautas�tva.\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t� ehhez az al��r�shoz!\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� alg. a \"%s\" felh. "
 "azonos�t�n!\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "%08lX kulcs: �rv�nytelen �nal��r�s a \"%s\" felh. azonos�t�n!\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsk�t�st.\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "%08lX kulcs: Visszavon� igazol�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - kihagytam.\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "leh�vom a %08lX visszavon� kulcsot.\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "visszavon� kulcs (%08lX) nincs jelen.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
@@ -2986,7 +2991,7 @@ msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
@@ -4233,17 +4238,17 @@ msgstr ""
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
@@ -5642,26 +5647,22 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "A DSA 160 bites hash (kivonatol�) algoritmust ig�nyel.\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "K�l�n�ll� al��r�st PGP 2.x st�lus� kulcsokkal csak --pgp2 m�dban k�sz�thet!\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5669,16 +5670,16 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Olvashat� sz�veget PGP 2.x st�lus� kulccsal csak --pgp2 m�dban �rhat al�!\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
@@ -6383,9 +6384,8 @@ msgstr "A m�velet nem lehets�ges biztons�gos mem�ria n�lk�l.\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "A DSA 160 bites hash (kivonatol�) algoritmust ig�nyel.\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/id.po b/po/id.po
index 0e3715d14..5d8058f17 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+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"
@@ -44,8 +44,8 @@ msgstr "menulis kunci rahasia ke `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -80,7 +80,7 @@ msgstr "catatan: file random_seed tidak diupdate\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
@@ -752,7 +752,7 @@ msgstr "--output tidak berfungsi untuk perintah ini\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -795,7 +795,7 @@ msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -814,7 +814,7 @@ msgstr "menggunakan cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
@@ -842,7 +842,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2346,334 +2346,339 @@ msgstr "     kunci rahasia dibaca: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "Anda telah menandai ID user ini:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
@@ -3002,7 +3007,7 @@ msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -4249,17 +4254,17 @@ msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -5645,43 +5650,39 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
@@ -6386,9 +6387,8 @@ msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Anda telah menandai ID user ini:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/it.po b/po/it.po
index d1301389e..9dd514379 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+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"
@@ -42,8 +42,8 @@ msgstr "scrittura della chiave segreta in `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -79,7 +79,7 @@ msgstr "nota: il file random_seed non � stato aggiornato\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
@@ -754,7 +754,7 @@ msgstr "--output non funziona con questo comando\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -797,7 +797,7 @@ msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -817,7 +817,7 @@ msgstr "uso il cifrario %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
@@ -848,7 +848,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2356,337 +2356,342 @@ msgstr "  chiavi segrete lette: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "Non puoi cancellare l'ultimo user ID!\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: \"%s\" una nuova firma\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chiave %08lX: \"%s\" non cambiata\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chiave %08lX: revoca della subchiave non valida\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
 "revoca %08lX non � presente.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
@@ -3013,7 +3018,7 @@ msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -4271,17 +4276,17 @@ msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -5695,43 +5700,39 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Firma %s da: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "nella modalit� --pgp2 puoi fare firme separate solo con chiavi in stile PGP "
 "2.x\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "In modalit� -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
@@ -6437,9 +6438,8 @@ msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Non puoi cancellare l'ultimo user ID!\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/ja.po b/po/ja.po
index 2b6083167..76ba1998a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+0200\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -45,8 +45,8 @@ msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -81,7 +81,7 @@ msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
@@ -723,7 +723,7 @@ msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -763,7 +763,7 @@ msgstr "���θ������ˤ���������̩����%s�ɤ�����ޤ�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ɥ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -782,7 +782,7 @@ msgstr "%s�Ź�ˡ��Ȥ��ޤ�\n"
 msgid "`%s' already compressed\n"
 msgstr "��%s�פϤ⤦���̺ѤߤǤ�\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: ��%s�פ϶��Υե�����Ǥ�\n"
@@ -807,7 +807,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: �оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2282,330 +2282,335 @@ msgstr "  ��̩�����ɽФ�: %lu\n"
 
 #: g10/import.c:566
 #, fuzzy, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "�ٹ�: ��%s�ˤϡ������ԲĤȤ�������������ޤ�\n"
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "�����Υ桼����ID�Υ��르�ꥺ��:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": �Ź楢�르�ꥺ������� %s\n"
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": ���󥢥르�ꥺ������� %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": ���̥��르�ꥺ������� %s\n"
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "����Ū�ʥ��르�ꥺ���԰���������򤱤뤿�ᡢ���θ�������ۤ��Ƥ�������\n"
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "�ʲ��ǡ������������Ǥ��ޤ�: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "��%s: �桼����ID������ޤ���\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "��%s: PKS��������¤����\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "��%s: ��������̤���ʽ�̾�Υ桼����ID��%s��\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "��%s: ͭ���ʥ桼����ID������ޤ���\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "��%s: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "��%s: ��������%s�ɤ��ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "��%s: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å����ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "��%s:��%s�ɿ������桼����ID��1��\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "��%s:��%s�ɿ�������̾��1��\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "��%s:��%s�ɿ�����������1��\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "��%s:��%s�ɿ�����������%d��\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "��%s:��%s���ѹ��ʤ�\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 msgid "importing secret keys not allowed\n"
 msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "��%s: ��̩�����ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "��%s: �⤦��̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "��%s: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "��%s: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "��%s: ̵���ʼ���������: %s - ����\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "��%s:��%s�ɼ�����������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "��%s: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤμ��ʽ�̾����̵���Ǥ�\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "��%s: �����б���������������ޤ���\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "��%s: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "��%s: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "��%s: ¿���������б��������ޤ�\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "��%s: �������ˤ�����������������ޤ���\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "��%s: ̵�������������Ǥ�\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "��%s: ̵����������¿�ż����������ޤ�\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "��%s: �ȤФ����桼����ID��%s��\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "��%s: �ȤФ�������\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "��%s: ��Ф��ԲĤʽ�̾ (���饹%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "��%s: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "��%s: ̵���ʼ���������: %s - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "��%s:��%s�ɼ�����������ɲ�\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
@@ -2904,7 +2909,7 @@ msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
@@ -4116,17 +4121,17 @@ msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
@@ -5461,39 +5466,35 @@ msgid ""
 "unexpanded.\n"
 msgstr "�ٹ�: �����������С�URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s��̾����̾��:��%s��\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϡ�PGP 2.x�����θ���ʬΥ��̾�Ǥ�������Ǥ�\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
@@ -6192,8 +6193,8 @@ msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤ����Ǥ��ޤ���\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
 
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "�����Υ桼����ID�Υ��르�ꥺ��:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/pl.po b/po/pl.po
index 518c90d2f..c35d92c54 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+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"
@@ -52,8 +52,8 @@ msgstr "zapisuj� klucz tajny w '%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -89,7 +89,7 @@ msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
@@ -772,7 +772,7 @@ msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -815,7 +815,7 @@ msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
@@ -835,7 +835,7 @@ msgstr "szyfrem %s\n"
 msgid "`%s' already compressed\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
@@ -862,7 +862,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2363,338 +2363,343 @@ msgstr "   tajnych kluczy wczytanych: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta� naprawiony\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym ,,%s''\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu klucza nim samym\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokaln� kopi�\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %08lX: ,,%s'' bez zmian\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klucz %08lX: klucz tajny z ustawionym szyfrem %d - pomini�ty\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego kt�rego dotyczy wczytany certyfikat\n"
 "              uniwa�nienia\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klucz %08lX: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "klucz %08lX: algorytm asymetryczny \"%s\" nie jest obs�ugiwany\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %08lX: nie obs�ugiwany algorytm asymetryczny\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %08lX: usuni�to wielokrotne dowi�zanie podklucza\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasy %02x) - pomini�ty\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: pomini�to certyfikat uniewa�nienia umieszczony \n"
 "              w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: pomini�to -  niepoprawny certyfikat uniewa�nienia: %s\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %08lX: do��czono powt�rzony identyfikator u�ytkownika\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewazniony:\n"
 "             zapytanie o uniewa�niaj�cy klucz %08lX w serwerze kluczy\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony:\n"
 "             brak uniewa�niaj�cego klucza %08lX.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
@@ -3021,7 +3026,7 @@ msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
@@ -4278,17 +4283,17 @@ msgstr ""
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
@@ -5686,42 +5691,37 @@ msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
 "           (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr ""
-"Algorytm DSA wymaga u�ycia algorytmu skr�tu daj�cego 160-bitowy wynik.\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis z�o�ony przez: ,,%s''\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "kluczami PGP 2 w trybie --pgp2 mo�na podpisywa� tylko do oddzielonych "
 "podpis�w\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 mo�na podpisywa� tylko za pomoc� kluczy z wersji 2.x\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
@@ -6427,9 +6427,9 @@ msgstr "bez zabezpieczenia pami�ci nie mo�na wykona� tej operacji\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr ""
+#~ "Algorytm DSA wymaga u�ycia algorytmu skr�tu daj�cego 160-bitowy wynik.\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/pt.po b/po/pt.po
index 54d4d1677..92a82026d 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+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"
@@ -45,8 +45,8 @@ msgstr "a escrever chave privada para `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -82,7 +82,7 @@ msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
@@ -751,7 +751,7 @@ msgstr "--output n�o funciona para este comando\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -794,7 +794,7 @@ msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -813,7 +813,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
@@ -841,7 +841,7 @@ msgid ""
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2338,336 +2338,341 @@ msgstr "      chaves secretas lidas: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "Assinou estes identificadores de utilizadores:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" n�o modificada\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica n�o suportado no utilizador \"%s\"\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida do utilizador \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o %"
 "08lX\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -2994,7 +2999,7 @@ msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -4244,17 +4249,17 @@ msgstr "NOTA: a cria��o de sub-chave para chaves v3 n�o respeito o OpenPGP\n"
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -5648,25 +5653,21 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA necessita de utiliza��o de uma algoritmo de dispers�o de 160 bit\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5674,15 +5675,15 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar � vista com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
@@ -6390,9 +6391,9 @@ msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Assinou estes identificadores de utilizadores:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr ""
+#~ "DSA necessita de utiliza��o de uma algoritmo de dispers�o de 160 bit\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b01010b47..c92389ee8 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -49,8 +49,8 @@ msgstr "escrevendo certificado privado para `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -86,7 +86,7 @@ msgstr ""
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
@@ -761,7 +761,7 @@ msgstr ""
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -805,7 +805,7 @@ msgstr "h� uma chave secreta para esta chave p�blica!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -824,7 +824,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
@@ -849,7 +849,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2302,332 +2302,337 @@ msgstr "      chaves secretas lidas: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "Voc� assinou estes IDs de usu�rio:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -2940,7 +2945,7 @@ msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -4190,17 +4195,17 @@ msgstr ""
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -5594,39 +5599,35 @@ msgid ""
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr ""
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
@@ -6343,10 +6344,6 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
 #, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Voc� assinou estes IDs de usu�rio:\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "a notation name must have only printable characters or spaces, and end "
 #~ "with an '='\n"
diff --git a/po/ro.po b/po/ro.po
index aefda95f9..61d5cb93a 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+0200\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -46,8 +46,8 @@ msgstr "scriu cheia secret� �n `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -84,7 +84,7 @@ msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
@@ -728,7 +728,7 @@ msgstr "--output nu merge pentru aceast� comand�\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -770,7 +770,7 @@ msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
@@ -789,7 +789,7 @@ msgstr "folosesc cifrul %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
@@ -818,7 +818,7 @@ msgstr ""
 "AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2332,335 +2332,340 @@ msgstr "     chei secrete citite: %lu\n"
 
 #: g10/import.c:566
 #, fuzzy, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "AVERTISMENT: cheia %s con�ine preferin�e pentru indisponibil\n"
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "algoritmuri pentru aceste ID-uri utilizator:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm de cifrare %s\n"
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm rezumat %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm compresie %s\n"
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 "este puternic sugerat s� v� actualiza�i preferin�ele �i re-distribui�i\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "aceast� cheie pentru a avita probleme poten�iale de ne-potrivire de "
 "algoritm\n"
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %s: nici un ID utilizator\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cheia %s: nici un ID utilizator valid\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "aceasta poate fi cauzat� de o auto-semn�tur� ce lipse�te\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cheia %s: cheie nou� - s�rit�\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cheia %s: cheia public� \"%s\" importat�\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cheia %s: nu se potrive�te cu copia noastr�\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cheia %s: nu pot g�si keyblock-ul original: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cheia %s: \"%s\" %d noi subchei\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nici un inel de chei secrete implicit: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %s: cheie secret� importat�\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cheia %s: deja �n inelul de chei secrete\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cheia %s: cheia secret� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cheia %s: nici o cheie public� - nu pot aplica certificatul de revocare\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cheia %s: nici un ID utilizator pentru semn�tur�\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cheia %s: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s"
 "\"\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cheia %s: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %s: legare subcheie invalid�\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %s: revocare de subcheie invalid�\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %s: am s�rit subcheia\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cheia %s: semn�tura nu poate fi exportat� (clasa 0x%02X) - s�rit�\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cheia %s: certificat de revocare �ntr-un loc gre�it - s�rit\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - s�rit\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
 "prezent�.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOT�: S/N-ul unei chei nu se potrive�te cu cel al cardului\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOT�: cheia primar� este online �i stocat� pe card\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOT�: cheia secundar� este online �i stocat� pe card\n"
 
@@ -2964,7 +2969,7 @@ msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
@@ -4172,17 +4177,17 @@ msgstr "NOT�: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOT�: copia de siguran�a a cheii cardului salvat� la `%s'\n"
@@ -5563,25 +5568,21 @@ msgstr ""
 "AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare).  �l "
 "folosesc neexpandat.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA necesit� folosirea unui algoritm cu hash de 160 bi�i\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s semn�tur� de la: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-data�at cu chei stil PGP 2.x numai �n modul --pgp2\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5589,15 +5590,15 @@ msgstr ""
 "AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
 "destinatarului\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-�n-clar cu chei stil PGP 2.x �n modul --pgp2\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
@@ -6293,8 +6294,8 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "algoritmuri pentru aceste ID-uri utilizator:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA necesit� folosirea unui algoritm cu hash de 160 bi�i\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/ru.po b/po/ru.po
index 50b77d7a6..0a3dcbf31 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.4.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+0200\n"
 "PO-Revision-Date: 2005-06-22 02:53+0200\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -44,8 +44,8 @@ msgstr "сохранение секретного ключа в `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -80,7 +80,7 @@ msgstr "замечание: файл random_seed не обновлен\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
@@ -724,7 +724,7 @@ msgstr "--output не работает для данной команды\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -764,7 +764,7 @@ msgstr "имеется секретный ключ для открытого к�
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "сначала используйте опцию \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
@@ -783,7 +783,7 @@ msgstr "используемый алгоритм шифрования %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' уже сжат\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
@@ -809,7 +809,7 @@ msgid ""
 msgstr ""
 "ВНИМАНИЕ: использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2305,333 +2305,338 @@ msgstr "      очищено User ID: %lu\n"
 
 #: g10/import.c:566
 #, fuzzy, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "ВНИМАНИЕ: ключ %s содержит недопустимые предпочтения\n"
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "алгоритмы для этих User ID:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": предпочитает шифр %s\n"
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": предпочитает хеш-функцию %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": предпочитает сжатие %s\n"
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "крайне желательно, чтобы Вы обновили Ваши предпочтения и\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "распространили этот ключ, чтобы избежать потенциальных проблем несовпадения "
 "алгоритмов\n"
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "Вы можете обновить список предпочтений используя:\n"
 "\tgpg --edit-key %s updpref save\n"
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: не имеет User ID\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: PKS повреждение ключа исправлено\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ключ %s: принят без самоподписанного User ID \"%s\"\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: нет действительных User ID\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиной этого может быть отсутствие самоподписи\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не найден открытый ключ: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новый ключ - пропущен\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "ошибка записи таблицы ключей `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: открытый ключ \"%s\" импортирован\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не совпадает с копией хранимой у нас\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: не нахожу оригинальный блок ключей: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: не могу прочитать оригинальный блок ключей: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: \"%s\" 1 новый User ID\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: \"%s\" %d новых User ID\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: \"%s\" 1 новая подпись\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: \"%s\" %d новых подписей\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ключ %s: \"%s\" %d User ID очищен\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ключ %s: \"%s\" %d  очищенных User ID\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: \"%s\" не изменен\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 msgid "importing secret keys not allowed\n"
 msgstr "импортирование секретного ключа не позволено\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "нет основной таблицы секретных ключей: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: секретный ключ импортирован\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "ключ %s: уже есть в таблице секретных ключей\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "ключ %s: не найден секретный ключ: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: \"%s\" сертификат отзыва импортирован\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: нет User ID для подписи\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: неподдерживаемый алгоритм с открытым ключом у User ID \"%s\" \n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %s: неправильная самоподпись на User ID \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: нет подключа для связывания подключей\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: неподдерживаемый алгоритм с открытым ключом\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: неправильная связь подключей\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: удалено многократное связывание подключей\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: нет подключа для отзывающего ключа\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: неправильный отзыв подключа\n"
 
 # test it
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: удалена многожественность подключей отзыва\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущен User ID \"%s\"\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущен подключ\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: не экспортируемая подпись (класс 0x%02X) - пропущена\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неизвестный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: обнаружено дублирование User ID - объединены\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: запрашиваю ключ отзыва %s\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: ключ отзыва %s не получен.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: \"%s\" добавлен сертификат отзыва\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: direct key signature добавлена\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "ПРЕДУПРЕЖДАЮ: S/N ключа не соответствует S/N ключа на карте\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: главный ключ готов и сохранен в карте\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: вторичный ключ готов и сохранен в карте\n"
 
@@ -2935,7 +2940,7 @@ msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
@@ -4128,17 +4133,17 @@ msgstr ""
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N)"
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой сохранения ключа на карту: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕТЬТЕ: архивная копия ключа на карте сохранена в `%s'\n"
@@ -5511,25 +5516,21 @@ msgstr ""
 "ВНИМАНИЕ: невозможно развернуть %% URL предпочитаемого сервера ключей "
 "(слишком длинно). Использую неразвернутым.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA требует использования 160 битной хэш-функции\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "сбой проверки созданной подписи: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s подпись от: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только отделенная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5537,15 +5538,15 @@ msgstr ""
 "ВНИМАНИЕ: использование хэш-функции %s (%d) нарушает предпочтения "
 "получателя\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только прозрачная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
@@ -6246,8 +6247,8 @@ msgstr ""
 "(возможно, Вы используете неподходящее программное обеспечение\n"
 "для данной задачи)\n"
 
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "алгоритмы для этих User ID:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA требует использования 160 битной хэш-функции\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/sk.po b/po/sk.po
index 6fcf7730f..255adf0ea 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: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+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"
@@ -41,8 +41,8 @@ msgstr "zapisujem tajn� k��� do `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -77,7 +77,7 @@ msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
@@ -748,7 +748,7 @@ msgstr "--output pre tento pr�kaz nefunguje\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -791,7 +791,7 @@ msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -810,7 +810,7 @@ msgstr "pou�it� �ifra %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
@@ -836,7 +836,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2345,339 +2345,344 @@ msgstr "      pre��tan� tajn� k���e: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
 
 # c-format
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to by� sp�soben� ch�baj�cim podpisom k���a n�m sam�m\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em n�js� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em ��ta� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� identifik�tor u��vate�a\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "k��� %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "k��� %08lX: tajn� k��� importovan�\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "k��� %08lX: je u� v s�bore tajn�ch k���ov\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "k��� %08lX: nebol n�jden� tajn� k���: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "k��� %08lX: ch�ba verejn� k��� - nem��em aplikova� revoka�n� certifik�t\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - zamietnut�\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a u u��vate�sk�ho id \"%s"
 "\"\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: neplatn� podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� v�zba podk���a\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "k��� %08lX: neexistuje podk��� na revok�ciu k���a\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "k��� %08lX: podk��� presko�en�\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "k��� %08lX: revoka�n� certifik�t na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - presko�en�\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: sk��am z�ska� revoka�n� k��� %"
 "08lX\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
@@ -3007,7 +3012,7 @@ msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
@@ -4249,17 +4254,17 @@ msgstr "POZN�MKA: vytvorenie podk���a pre k���e v3 nie je v s�lade s OpenPGP\n"
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
@@ -5651,43 +5656,39 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA po�aduje pou�itie 160 bitov�ho hashovacieho algoritmu\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytvori� len oddelen� podpis k���a vo form�te PGP-2.x\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� �itate�n� podpisy len s k���mi form�tu PGP-2."
 "x\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
@@ -6394,9 +6395,8 @@ msgstr "vykonanie oper�cie nie je mo�n� bez inicializovanej bezpe�nej pam�te\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA po�aduje pou�itie 160 bitov�ho hashovacieho algoritmu\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/sv.po b/po/sv.po
index aa8a934bc..0876c2eb9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+0200\n"
 "PO-Revision-Date: 2004-12-01 17:49+0100\n"
 "Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -60,8 +60,8 @@ msgstr "skriver hemlig nyckel till \"%s\"\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -96,7 +96,7 @@ msgstr "Obs: random_seed uppdaterades inte\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
@@ -773,7 +773,7 @@ msgstr "--output kan inte användas för detta kommando\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -816,7 +816,7 @@ msgstr "det finns en hemlig nyckel tillhörande denna öppna nyckel!\"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av lösenmening: %s\n"
@@ -835,7 +835,7 @@ msgstr "använderchiffer %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' är redan komprimerad\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
@@ -864,7 +864,7 @@ msgstr ""
 "att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas "
 "inställningar\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2401,299 +2401,304 @@ msgstr "      antal lästa hemliga nycklar: %lu\n"
 
 #: g10/import.c:566
 #, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "Du har signerat följande användaridentiteter:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: g10/import.c:746
+#: g10/import.c:749
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %08lX: HKP-skadad undernyckel har reparerats!\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:761
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "nyckel %08lX: accepterade användaridentitet ID '%s' som saknar egensignatur\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en egensignatur\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen öppen nyckel: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %08lX: ny nyckel - hoppade över den\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:822
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %08lX: importerade öppen nyckel \"%s\"\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte vår lokala kopia\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny användaridentitet\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny signatur\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny undernyckel\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %08lX: \"%s\" %d nya undernycklar\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %08lX: \"%s\" inte ändrad\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "nyckel %08lX: hemlig nyckel med ogiltig krypteringsalgoritm %d - hoppade "
 "över den\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln är importerad\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nyckel %08lX: öppen nyckel saknas - kan inte spärra nyckeln med "
 "spärrcertifikatet\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen användaridentitet för signaturen\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "nyckel %08lX: algoritmen för öppna nycklar stöds inte för användar-ID  \"%s"
 "\"\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nyckel %08lX: ogiltig egensignatur på användar-id \"%s\"\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nyckel %08lX: algoritmen för öppna nycklar stöds inte\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %08lX: tog bort multipla bindningar av undernyckel\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %08lX: ingen undernyckel för spärr av nyckeln\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %08lX: ogiltig spärr av undernyckel\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %08lX: tog bort multipla spärrar av undernyckel\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %08lX: hoppade över användaridentitet '"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade över undernyckel\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över den\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "nyckel %08lX: spärrcertifikat på fel plats - hoppade över certifikatet\n"
 
 # nyckeln eller certifikatet??
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - hoppade över det\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
@@ -2701,49 +2706,49 @@ msgstr ""
 "signaturen\n"
 
 # nyckeln eller klassen?
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "nyckel %08lX: oväntad signaturklass  (0x%02X) - hoppade över signaturen\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "nyckel %08lX: användaridentitet hittades flera gånger - slog ihop till en\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "VARNING: nyckeln %08lX kan ha spärrats: Hämtar spärrnyckel %08lX\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VARNING: nyckeln %08lX kan ha spärrats: Spärrnyckeln %08lX saknas.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %08lX: lagt till direkt nyckelsignatur\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "den öppna nyckel passar inte ihop med den hemliga nyckeln!\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
@@ -3078,7 +3083,7 @@ msgid "Really sign? (y/N) "
 msgstr "Vill du verkligen signera? "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
@@ -4344,17 +4349,17 @@ msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 msgid "Really create? (y/N) "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -5784,27 +5789,23 @@ msgstr ""
 "VARNING: kan inte %%-expandera policy-url (för stor).  Använder den utan "
 "expansion.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA kräver att du använder en 160-bitars kontrollsummealgoritm\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "försök att verifiera den skapade signaturen misslyckades: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur från: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara skapa signaturer i en separat fil med nycklar av PGP 2.x-typ\n"
 "när du är i --pgp2-läge\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5812,17 +5813,17 @@ msgstr ""
 "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inst?"
 "llningar\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra klartextsignaturer med en PGP 2.x-nyckel\n"
 "när du är i --pgp2-läge\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
@@ -6537,9 +6538,8 @@ msgstr "operationen är inte möjlig utan tillgång till säkert minne\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha använt fel program för denna uppgift)\n"
 
-#, fuzzy
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Du har signerat följande användaridentiteter:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA kräver att du använder en 160-bitars kontrollsummealgoritm\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/tr.po b/po/tr.po
index e2476d25e..53a488d61 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-06-25 13:35+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+0200\n"
 "PO-Revision-Date: 2005-03-16 07:30+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -43,8 +43,8 @@ msgstr "gizli anahtarı `%s'e yazıyor\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -79,7 +79,7 @@ msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
@@ -721,7 +721,7 @@ msgstr "--output seçeneği bu komutla çalışmaz\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -761,7 +761,7 @@ msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@ -780,7 +780,7 @@ msgstr "%s şifrelemesi kullanılıyor\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
@@ -809,7 +809,7 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
 "zorlanıyor\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2283,342 +2283,347 @@ msgstr "     gizli anahtarlar okundu: %lu\n"
 
 #: g10/import.c:566
 #, fuzzy, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "UYARI: anahtar %s kullanılabilir olmayan tercihler içeriyor\n"
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "Bu kullanıcı kimlikler için algoritmalar:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": şifreleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": özümleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 "         \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
 "\n"
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "tercihlerinizi güncellemenizi ve\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
 "tekrar dağıtmanızı şiddetle öneririz.\n"
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "anahtar %s: genel anahtar yok: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "anahtar %s: yeni anahtar - atlandı\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "anahtar %s: \"%s\" değişmedi\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı alımına izin verilmez\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "anahtar %s: gizli anahtar alındı\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "anahtar %s: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "anahtar %s: gizli anahtar yok: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "anahtar %s: yardımcı anahtar atlandı\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %s alınıyor\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %s mevcut değil.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "BİLGİ: bir anahtarın seri numarası kartlardan biriyle uyuşmuyor\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "BİLGİ: asıl anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "BİLGİ: ikincil anahtar kart üzerinde saklı ve kullanılabilir\n"
 
@@ -2921,7 +2926,7 @@ msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
@@ -4154,17 +4159,17 @@ msgstr ""
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
@@ -5539,26 +5544,22 @@ msgstr ""
 "UYARI: tercih edilen anahtar sunucu adresi için %%lik uzatma imkansız\n"
 "(çok büyük). Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s imza: \"%s\" den\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5566,17 +5567,17 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) özümleme algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama "
 "yapabilirsiniz\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
@@ -6273,8 +6274,8 @@ msgstr "güvenli bellek hazırlanmadan işlem yapmak mümkün değil\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "Bu kullanıcı kimlikler için algoritmalar:\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 99a5783cc..9de43a52e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-07-26 18:08+0200\n"
+"POT-Creation-Date: 2006-07-26 12:43+0200\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -43,28 +43,12 @@ msgstr "无法锁定‘%s’：%s\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "等待‘%s’上的锁\n"
 
-#: cipher/random.c:448
-#: g10/card-util.c:678
-#: g10/card-util.c:747
-#: g10/dearmor.c:61
-#: g10/dearmor.c:110
-#: g10/encode.c:184
-#: g10/encode.c:474
-#: g10/gpg.c:1003
-#: g10/gpg.c:3461
-#: g10/import.c:195
-#: g10/keygen.c:2385
-#: g10/keyring.c:1525
-#: g10/openfile.c:186
-#: g10/openfile.c:342
-#: g10/plaintext.c:481
-#: g10/sign.c:830
-#: g10/sign.c:1005
-#: g10/sign.c:1118
-#: g10/sign.c:1268
-#: g10/tdbdump.c:141
-#: g10/tdbdump.c:149
-#: g10/tdbio.c:540
+#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
+#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
+#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -97,24 +81,14 @@ msgstr "无法读取‘%s’：%s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "注意：随机数种子文件未被更新\n"
 
-#: cipher/random.c:544
-#: g10/exec.c:481
-#: g10/gpg.c:1002
-#: g10/keygen.c:2864
-#: g10/keygen.c:2894
-#: g10/keyring.c:1201
-#: g10/keyring.c:1501
-#: g10/openfile.c:263
-#: g10/openfile.c:357
-#: g10/sign.c:848
-#: g10/sign.c:1134
-#: g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
+#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: cipher/random.c:556
-#: cipher/random.c:566
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "无法写入‘%s’：%s\n"
@@ -177,40 +151,30 @@ msgstr "无法存储创建日期：%s\n"
 msgid "reading public key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: g10/app-openpgp.c:985
-#: g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: g10/app-openpgp.c:993
-#: g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: g10/app-openpgp.c:1002
-#: g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
-#: g10/app-openpgp.c:1258
-#: g10/app-openpgp.c:1346
-#: g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
 
-#: g10/app-openpgp.c:1264
-#: g10/app-openpgp.c:1352
-#: g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: g10/app-openpgp.c:1273
-#: g10/app-openpgp.c:1287
-#: g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169
-#: g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
@@ -219,13 +183,11 @@ msgstr "验证 CHV%d 失败：%s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: g10/app-openpgp.c:1325
-#: g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: g10/app-openpgp.c:1331
-#: g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
@@ -257,13 +219,11 @@ msgstr "新的 PIN"
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: g10/app-openpgp.c:1546
-#: g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: g10/app-openpgp.c:1552
-#: g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
@@ -293,8 +253,7 @@ msgstr "RSA 余数缺失或者不是 %d 位长\n"
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: g10/app-openpgp.c:1757
-#: g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
@@ -337,11 +296,11 @@ msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
 #: g10/app-openpgp.c:2403
-msgid "verification of Admin PIN is currently prohibited through this command\n"
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: g10/app-openpgp.c:2474
-#: g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
@@ -375,8 +334,7 @@ msgstr "与预期不符的 ASCII 封装："
 msgid "invalid dash escaped line: "
 msgstr "以连字符开头的行格式错误："
 
-#: g10/armor.c:734
-#: g10/armor.c:1343
+#: g10/armor.c:734 g10/armor.c:1343
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
@@ -393,8 +351,7 @@ msgstr "文件先于预期结束(CRC 部分未结束)\n"
 msgid "malformed CRC\n"
 msgstr "异常的 CRC\n"
 
-#: g10/armor.c:823
-#: g10/armor.c:1380
+#: g10/armor.c:823 g10/armor.c:1380
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 错误：%06lx - %06lx\n"
@@ -417,11 +374,11 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
 
 #: g10/armor.c:1167
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
 
-#: g10/card-util.c:63
-#: g10/card-util.c:306
+#: g10/card-util.c:63 g10/card-util.c:306
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
@@ -431,29 +388,18 @@ msgstr "OpenPGP 卡不可用：%s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:76
-#: g10/card-util.c:1406
-#: g10/delkey.c:128
-#: g10/keyedit.c:1524
-#: g10/keygen.c:2569
-#: g10/revoke.c:218
-#: g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:103
-#: g10/card-util.c:1132
-#: g10/card-util.c:1215
-#: g10/keyedit.c:425
-#: g10/keyedit.c:446
-#: g10/keyedit.c:460
-#: g10/keygen.c:1381
+#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
 #: g10/keygen.c:1448
 msgid "Your selection? "
 msgstr "您的选择？ "
 
-#: g10/card-util.c:216
-#: g10/card-util.c:266
+#: g10/card-util.c:216 g10/card-util.c:266
 msgid "[not set]"
 msgstr "[未设定]"
 
@@ -511,9 +457,7 @@ msgstr "获取公钥的 URL："
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:687
-#: g10/card-util.c:756
-#: g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -582,8 +526,7 @@ msgstr "取得当前密钥信息时出错：%s\n"
 msgid "Replace existing key? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1054
-#: g10/card-util.c:1063
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
 
@@ -606,28 +549,20 @@ msgstr ""
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/card-util.c:1125
-#: g10/card-util.c:1206
+#: g10/card-util.c:1125 g10/card-util.c:1206
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签名密钥\n"
 
-#: g10/card-util.c:1126
-#: g10/card-util.c:1208
+#: g10/card-util.c:1126 g10/card-util.c:1208
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1127
-#: g10/card-util.c:1210
+#: g10/card-util.c:1127 g10/card-util.c:1210
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1143
-#: g10/card-util.c:1226
-#: g10/keyedit.c:946
-#: g10/keygen.c:1385
-#: g10/keygen.c:1413
-#: g10/keygen.c:1487
-#: g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
+#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
@@ -647,8 +582,7 @@ msgstr "私钥部分不可用\n"
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1319
-#: g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
@@ -656,8 +590,7 @@ msgstr "离开这个菜单"
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1322
-#: g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "显示这份在线说明"
 
@@ -709,8 +642,7 @@ msgstr "更改或解锁 PIN 的菜单"
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:1457
-#: g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "命令> "
 
@@ -726,8 +658,7 @@ msgstr "允许使用管理员命令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1602
-#: g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
@@ -772,43 +703,29 @@ msgstr "再次输入此 PIN："
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 
-#: g10/decrypt.c:69
-#: g10/decrypt.c:160
-#: g10/gpg.c:3826
-#: g10/keyring.c:377
-#: g10/keyring.c:663
-#: g10/verify.c:102
-#: g10/verify.c:157
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
 
-#: g10/decrypt.c:105
-#: g10/encode.c:839
+#: g10/decrypt.c:105 g10/encode.c:839
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/delkey.c:75
-#: g10/export.c:311
-#: g10/keyedit.c:3387
-#: g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:83
-#: g10/export.c:341
-#: g10/import.c:2346
-#: g10/keyserver.c:1714
-#: g10/revoke.c:234
-#: g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "读取密钥区块时发生错误：%s\n"
 
-#: g10/delkey.c:129
-#: g10/delkey.c:136
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非您用指纹指定密钥)\n"
 
@@ -842,8 +759,7 @@ msgstr "公钥“%s”有对应的私钥！\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:213
-#: g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
@@ -857,15 +773,12 @@ msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
 msgid "using cipher %s\n"
 msgstr "使用对称加密算法 %s\n"
 
-#: g10/encode.c:241
-#: g10/encode.c:536
+#: g10/encode.c:241 g10/encode.c:536
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encode.c:292
-#: g10/encode.c:584
-#: g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
@@ -880,18 +793,21 @@ msgid "reading from `%s'\n"
 msgstr "正在从‘%s’读取\n"
 
 #: g10/encode.c:508
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "您正要用来加密的所有密钥都不能使用 IDEA 算法。\n"
 
 #: g10/encode.c:518
 #, c-format
-msgid "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:628
-#: g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, c-format
-msgid "WARNING: forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
 msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
 
 #: g10/encode.c:715
@@ -899,9 +815,7 @@ msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项�
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:785
-#: g10/pkclist.c:803
-#: g10/pkclist.c:851
+#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "您不该将 %s 用于 %s 模式中\n"
@@ -911,20 +825,19 @@ msgstr "您不该将 %s 用于 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给：“%s”\n"
 
-#: g10/encr-data.c:67
-#: g10/mainproc.c:293
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/encr-data.c:69
-#: g10/mainproc.c:297
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
 
 #: g10/encr-data.c:93
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n"
 
 #: g10/encr-data.c:104
@@ -935,14 +848,14 @@ msgstr "处理加密包有问题\n"
 msgid "no remote program execution supported\n"
 msgstr "不支持远程调用\n"
 
-#: g10/exec.c:176
-#: g10/openfile.c:415
+#: g10/exec.c:176 g10/openfile.c:415
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
 #: g10/exec.c:317
-msgid "external program calls are disabled due to unsafe options file permissions\n"
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
 msgstr "由于配置文件权限不安全，外部程序调用被禁用\n"
 
 #: g10/exec.c:347
@@ -964,8 +877,7 @@ msgstr "无法在命令解释环境中执行‘%s’：%s\n"
 msgid "system error while calling external program: %s\n"
 msgstr "调用外部程序时发生系统错误：%s\n"
 
-#: g10/exec.c:524
-#: g10/exec.c:590
+#: g10/exec.c:524 g10/exec.c:590
 msgid "unnatural exit of external program\n"
 msgstr "外部程序异常退出\n"
 
@@ -978,8 +890,7 @@ msgstr "无法执行外部程序\n"
 msgid "unable to read external program response: %s\n"
 msgstr "无法读取外部程序响应：%s\n"
 
-#: g10/exec.c:601
-#: g10/exec.c:608
+#: g10/exec.c:601 g10/exec.c:608
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n"
@@ -1179,8 +1090,7 @@ msgstr "更新信任度数据库"
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:437
-#: g10/gpgv.c:71
+#: g10/gpg.c:437 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1214,8 +1124,7 @@ msgstr "使用标准的文本模式"
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:474
-#: g10/gpgv.c:73
+#: g10/gpg.c:474 g10/gpgv.c:73
 msgid "verbose"
 msgstr "详细模式"
 
@@ -1263,8 +1172,7 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/gpg.c:757
-#: g10/gpgv.c:98
+#: g10/gpg.c:757 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
@@ -1296,8 +1204,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:797
-#: g10/keyedit.c:2310
+#: g10/gpg.c:797 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "对称加密："
 
@@ -1305,8 +1212,7 @@ msgstr "对称加密："
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:809
-#: g10/keyedit.c:2356
+#: g10/gpg.c:809 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "压缩："
 
@@ -1360,7 +1266,8 @@ msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
 #: g10/gpg.c:1282
 #, c-format
-msgid "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
 #: g10/gpg.c:1285
@@ -1375,7 +1282,8 @@ msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
 #: g10/gpg.c:1294
 #, c-format
-msgid "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
 #: g10/gpg.c:1297
@@ -1452,9 +1360,7 @@ msgstr "配置文件‘%s’：%s\n"
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:2188
-#: g10/gpg.c:2814
-#: g10/gpg.c:2833
+#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
@@ -1464,8 +1370,7 @@ msgstr "注意：一般情况下不会用到 %s！\n"
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/gpg.c:2364
-#: g10/gpg.c:2376
+#: g10/gpg.c:2364 g10/gpg.c:2376
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
@@ -1475,9 +1380,7 @@ msgstr "‘%s’不是一个有效的签名过期日期\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2476
-#: g10/gpg.c:2663
-#: g10/keyedit.c:4064
+#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
@@ -1625,13 +1528,11 @@ msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:2947
-#: g10/gpg.c:2971
+#: g10/gpg.c:2947 g10/gpg.c:2971
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:2953
-#: g10/gpg.c:2977
+#: g10/gpg.c:2953 g10/gpg.c:2977
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
@@ -1863,10 +1764,7 @@ msgstr "pk 缓存里项目太多――已禁用\n"
 msgid "[User ID not found]"
 msgstr "[找不到用户标识]"
 
-#: g10/getkey.c:948
-#: g10/getkey.c:958
-#: g10/getkey.c:968
-#: g10/getkey.c:984
+#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
 #: g10/getkey.c:999
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
@@ -1877,8 +1775,7 @@ msgstr "自动获取‘%s’，通过 %s\n"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2380
-#: g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3707
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
@@ -1945,7 +1842,8 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "如果您无论如何要使用这把未被信任的密钥，请回答“yes”。"
 
 #: g10/helptext.c:66
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "输入您要递送的报文的接收者的用户标识。"
 
 #: g10/helptext.c:70
@@ -1984,13 +1882,8 @@ msgstr ""
 msgid "Enter the size of the key"
 msgstr "请输入密钥的尺寸"
 
-#: g10/helptext.c:95
-#: g10/helptext.c:100
-#: g10/helptext.c:112
-#: g10/helptext.c:144
-#: g10/helptext.c:172
-#: g10/helptext.c:177
-#: g10/helptext.c:182
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "请回答“yes”或“no”"
 
@@ -2041,26 +1934,36 @@ msgid ""
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
@@ -2336,278 +2239,270 @@ msgid "      user IDs cleaned: %lu\n"
 msgstr "  清除的用户标识：%lu\n"
 
 #: g10/import.c:566
-#, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+#, fuzzy, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的算法：\n"
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "      新用户标识：%lu\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s”：对称加密算法 %s 对应首选项\n"
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s”：散列算法 %s 对应首选项\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s”：压缩算法 %s 对应首选项\n"
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "以避免可能的算法不匹配问题\n"
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:717
-#: g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥 %s：PKS 子钥破损已修复\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "密钥 %s：已接受不含自身签名的用户标识“%s”\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这可能由于遗失自身签名所致\n"
 
-#: g10/import.c:779
-#: g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥――已跳过\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:799
-#: g10/openfile.c:267
-#: g10/sign.c:853
-#: g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: g10/import.c:803
-#: g10/import.c:898
-#: g10/import.c:1155
-#: g10/import.c:1298
-#: g10/import.c:2360
-#: g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥“%s”已导入\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不吻合\n"
 
-#: g10/import.c:863
-#: g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:871
-#: g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s”一个新的用户标识\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s”1 个新的签名\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s”%d 个新的签名\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s”1 个新的子钥\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s”%d 个新的子钥\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s”未改变\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 msgid "importing secret keys not allowed\n"
 msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1149
-#: g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "没有默认的私钥钥匙环： %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "密钥 %s：已在私钥钥匙环中\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "密钥 %s：找不到私钥：%s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s”吊销证书已被导入\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签名没有用户标识\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”自身签名无效\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有可供绑定的子钥\n"
 
-#: g10/import.c:1417
-#: g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的子钥绑定\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多重子钥绑定\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的子钥吊销\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多重子钥吊销\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识“%s”\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过子钥\n"
@@ -2616,65 +2511,65 @@ msgstr "密钥 %s：已跳过子钥\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：不可导出的签名(验证级别 0x%02X)――已跳过\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：子钥签名位置错误――已跳过\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已新增吊销证书“%s”\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已新增直接密钥签名\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "注意：密钥的序列号与卡的不符\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "注意：主钥在线，存储在卡上\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "注意：子钥在线，存储在卡上\n"
 
@@ -2688,8 +2583,7 @@ msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 msgid "keyring `%s' created\n"
 msgstr "钥匙环‘%s’已建立\n"
 
-#: g10/keydb.c:316
-#: g10/keydb.c:319
+#: g10/keydb.c:316 g10/keydb.c:319
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "密钥块资源‘%s’：%s\n"
@@ -2707,35 +2601,29 @@ msgstr "[吊销]"
 msgid "[self-signature]"
 msgstr "[自身签名]"
 
-#: g10/keyedit.c:345
-#: g10/keylist.c:390
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 个损坏的签名\n"
 
-#: g10/keyedit.c:347
-#: g10/keylist.c:392
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 个损坏的签名\n"
 
-#: g10/keyedit.c:349
-#: g10/keylist.c:394
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份签名因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:351
-#: g10/keylist.c:396
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份签名因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:353
-#: g10/keylist.c:398
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份签名因为某个错误而未被检查\n"
 
-#: g10/keyedit.c:355
-#: g10/keylist.c:400
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份签名因为某些错误而未被检查\n"
@@ -2749,23 +2637,23 @@ msgstr "检测到 1 个没有有效自身签名的用户标识\n"
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "检测到 %d 个没有有效自身签名的用户标识\n"
 
-#: g10/keyedit.c:415
-#: g10/pkclist.c:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 msgid ""
-"Please decide how far you trust this user to correctly verify other users' keys\n"
-"(by looking at passports, checking fingerprints from different sources, etc.)\n"
+"Please decide how far you trust this user to correctly verify other users' "
+"keys\n"
+"(by looking at passports, checking fingerprints from different sources, "
+"etc.)\n"
 msgstr ""
-"您是否相信这位用户有能力验证其他用户密钥的有效性(查对身份证、通过不同的渠道检查\n"
+"您是否相信这位用户有能力验证其他用户密钥的有效性(查对身份证、通过不同的渠道检"
+"查\n"
 "指纹等)？\n"
 
-#: g10/keyedit.c:419
-#: g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉强相信\n"
 
-#: g10/keyedit.c:420
-#: g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全相信\n"
@@ -2788,19 +2676,12 @@ msgstr "请输入这份签名的限制域，如果没有请按回车。\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
 
-#: g10/keyedit.c:608
-#: g10/keyedit.c:636
-#: g10/keyedit.c:663
-#: g10/keyedit.c:831
-#: g10/keyedit.c:896
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签名吗？(y/N)"
 
-#: g10/keyedit.c:622
-#: g10/keyedit.c:650
-#: g10/keyedit.c:677
-#: g10/keyedit.c:837
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
 #: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签名。\n"
@@ -2892,7 +2773,9 @@ msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "您想要让您的签名也同时过期吗？ (Y/n) "
 
 #: g10/keyedit.c:889
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
 msgstr "您不能在 --pgp2 模式下，用 PGP 2.x 密钥生成 OpenPGP 签名。\n"
 
 #: g10/keyedit.c:891
@@ -2901,7 +2784,8 @@ msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
 
 #: g10/keyedit.c:916
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "您是否谨慎地检查过，确认正要签名的密钥的确属于以上它所声称的所有者呢？\n"
@@ -2976,12 +2860,8 @@ msgstr "我非常小心地检查过这把密钥。\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N)"
 
-#: g10/keyedit.c:1067
-#: g10/keyedit.c:4783
-#: g10/keyedit.c:4874
-#: g10/keyedit.c:4938
-#: g10/keyedit.c:4999
-#: g10/sign.c:374
+#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
@@ -2990,24 +2870,19 @@ msgstr "签名时失败： %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1143
-#: g10/keygen.c:3199
+#: g10/keyedit.c:1143 g10/keygen.c:3199
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1147
-#: g10/keygen.c:3187
-#: g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1151
-#: g10/keygen.c:3202
+#: g10/keyedit.c:1151 g10/keygen.c:3202
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1155
-#: g10/keygen.c:3206
+#: g10/keyedit.c:1155 g10/keygen.c:3206
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
@@ -3024,8 +2899,7 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1194
-#: g10/keygen.c:1897
+#: g10/keyedit.c:1194 g10/keygen.c:1897
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
@@ -3216,7 +3090,8 @@ msgstr "请先使用“toggle”指令。\n"
 
 #: g10/keyedit.c:1696
 msgid ""
-"* The `sign' command may be prefixed with an `l' for local signatures (lsign),\n"
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
@@ -3246,9 +3121,7 @@ msgstr "未知的签名类型‘%s’\n"
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/keyedit.c:1816
-#: g10/keyedit.c:1836
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "您至少得选择一个用户标识。\n"
 
@@ -3319,7 +3192,8 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的要吊销这把子钥吗？(y/N)"
 
 #: g10/keyedit.c:2087
-msgid "Owner trust may not be set while using an user provided trust database\n"
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
 #: g10/keyedit.c:2129
@@ -3368,13 +3242,11 @@ msgstr "特点："
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2411
-#: g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2419
-#: g10/keyedit.c:2420
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
 msgid "Notations: "
 msgstr "注记："
 
@@ -3396,43 +3268,25 @@ msgstr "这把密钥可被 %s 密钥 %s 吊销"
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2732
-#: g10/keyedit.c:2788
-#: g10/keyedit.c:2849
-#: g10/keyedit.c:2864
-#: g10/keylist.c:194
-#: g10/keyserver.c:511
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keyserver.c:511
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2735
-#: g10/keylist.c:771
-#: g10/keylist.c:865
-#: g10/mainproc.c:964
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2737
-#: g10/keylist.c:742
-#: g10/keylist.c:777
-#: g10/keylist.c:871
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2739
-#: g10/keyedit.c:2790
-#: g10/keyedit.c:2851
-#: g10/keyedit.c:2866
-#: g10/keylist.c:196
-#: g10/keylist.c:748
-#: g10/keylist.c:783
-#: g10/keylist.c:877
-#: g10/keylist.c:898
-#: g10/keyserver.c:517
-#: g10/mainproc.c:970
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
@@ -3456,8 +3310,7 @@ msgstr "有效性：%s"
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2795
-#: g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡号："
 
@@ -3467,21 +3320,13 @@ msgid ""
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2883
-#: g10/keyedit.c:3229
-#: g10/keyserver.c:521
-#: g10/mainproc.c:1772
-#: g10/trustdb.c:1179
-#: g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
+#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2885
-#: g10/keyedit.c:3231
-#: g10/keyserver.c:525
-#: g10/mainproc.c:1774
-#: g10/trustdb.c:532
-#: g10/trustdb.c:1701
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
+#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "已过期"
 
@@ -3489,18 +3334,19 @@ msgstr "已过期"
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
-msgstr "警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
+msgstr ""
+"警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
 
 #: g10/keyedit.c:3011
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:3016
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
@@ -3538,8 +3384,7 @@ msgstr "已经删除了 %d 个签名。\n"
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3233
-#: g10/trustdb.c:1703
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "无效"
 
@@ -3550,7 +3395,8 @@ msgstr "用户标识“%s”：无用部分已清除\n"
 
 #: g10/keyedit.c:3341
 msgid ""
-"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may cause\n"
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
@@ -3587,7 +3433,8 @@ msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
 #: g10/keyedit.c:3459
-msgid "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
 #: g10/keyedit.c:3520
@@ -3628,10 +3475,7 @@ msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3875
-#: g10/keyedit.c:3985
-#: g10/keyedit.c:4105
-#: g10/keyedit.c:4246
+#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签名\n"
@@ -3676,16 +3520,12 @@ msgstr "没有索引为 %d 的子钥\n"
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4625
-#: g10/keyedit.c:4689
-#: g10/keyedit.c:4732
+#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:4627
-#: g10/keyedit.c:4691
-#: g10/keyedit.c:4734
+#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
@@ -3787,19 +3627,13 @@ msgstr "正在写入自身签名\n"
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
-#: g10/keygen.c:1022
-#: g10/keygen.c:1104
-#: g10/keygen.c:1109
-#: g10/keygen.c:1225
+#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
 #: g10/keygen.c:2762
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:1027
-#: g10/keygen.c:1115
-#: g10/keygen.c:1230
-#: g10/keygen.c:2768
+#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
@@ -3917,8 +3751,7 @@ msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1556
-#: g10/keygen.c:1561
+#: g10/keygen.c:1556 g10/keygen.c:1561
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
@@ -4001,13 +3834,15 @@ msgstr "以上正确吗？(y/n)"
 #: g10/keygen.c:1715
 msgid ""
 "\n"
-"You need a user ID to identify your key; the software constructs the user ID\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
 "from the Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 msgstr ""
 "\n"
-"您需要一个用户标识来辨识您的密钥；本软件会用真实姓名、注释和电子邮件地址组合\n"
+"您需要一个用户标识来辨识您的密钥；本软件会用真实姓名、注释和电子邮件地址组"
+"合\n"
 "成用户标识，如下所示：\n"
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
@@ -4099,8 +3934,7 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:1898
-#: g10/passphrase.c:810
+#: g10/keygen.c:1898 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4131,20 +3965,17 @@ msgstr ""
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:2907
-#: g10/keygen.c:3052
+#: g10/keygen.c:2907 g10/keygen.c:3052
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:2909
-#: g10/keygen.c:3055
+#: g10/keygen.c:2909 g10/keygen.c:3055
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:2912
-#: g10/keygen.c:3058
+#: g10/keygen.c:2912 g10/keygen.c:3058
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
@@ -4181,56 +4012,47 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3118
-#: g10/keygen.c:3247
-#: g10/keygen.c:3363
+#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3170
-#: g10/keygen.c:3298
-#: g10/sign.c:276
+#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3172
-#: g10/keygen.c:3300
-#: g10/sign.c:278
+#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3181
-#: g10/keygen.c:3311
+#: g10/keygen.c:3181 g10/keygen.c:3311
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3220
-#: g10/keygen.c:3344
+#: g10/keygen.c:3220 g10/keygen.c:3344
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
 
-#: g10/keyid.c:498
-#: g10/keyid.c:510
-#: g10/keyid.c:522
-#: g10/keyid.c:534
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "永不过期"
 
@@ -4277,8 +4099,7 @@ msgid "      Subkey fingerprint:"
 msgstr " 子钥指纹："
 
 #  use tty
-#: g10/keylist.c:1520
-#: g10/keylist.c:1524
+#: g10/keylist.c:1520 g10/keylist.c:1524
 msgid "      Key fingerprint ="
 msgstr "密钥指纹 ="
 
@@ -4370,8 +4191,7 @@ msgstr "已禁用"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
-#: g10/keyserver.c:808
-#: g10/keyserver.c:1421
+#: g10/keyserver.c:808 g10/keyserver.c:1421
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
@@ -4425,8 +4245,7 @@ msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1381
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1381 g10/keyserver.c:1477
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作！\n"
 
@@ -4439,8 +4258,7 @@ msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1500
-#: g10/keyserver.c:2028
+#: g10/keyserver.c:1500 g10/keyserver.c:2028
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
@@ -4476,8 +4294,7 @@ msgstr "公钥服务器内部错误\n"
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误：%s\n"
 
-#: g10/keyserver.c:1577
-#: g10/keyserver.c:1611
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
@@ -4536,8 +4353,7 @@ msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
-#: g10/mainproc.c:476
-#: g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
@@ -4561,8 +4377,7 @@ msgstr "以 %lu 个密码加密\n"
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:541
-#: g10/mainproc.c:563
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
@@ -4633,20 +4448,17 @@ msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1677
-#: g10/mainproc.c:1725
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签名，来自于“%s”"
 
-#: g10/mainproc.c:1679
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签名，来自于“%s”"
 
-#: g10/mainproc.c:1681
-#: g10/mainproc.c:1729
+#: g10/mainproc.c:1681 g10/mainproc.c:1729
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签名，来自于“%s”"
@@ -4683,8 +4495,7 @@ msgstr "二进制"
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1873
-#: g10/trustdb.c:531
+#: g10/mainproc.c:1873 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
@@ -4693,14 +4504,13 @@ msgstr "未知"
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:1962
-#: g10/mainproc.c:1978
-#: g10/mainproc.c:2064
+#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签名\n"
 
 #: g10/mainproc.c:2005
-msgid "WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
 #: g10/mainproc.c:2013
@@ -4721,9 +4531,7 @@ msgstr "在 proc_tree() 中检测到无效的根包\n"
 msgid "can't disable core dumps: %s\n"
 msgstr "无法禁用核心内存转储：%s\n"
 
-#: g10/misc.c:142
-#: g10/misc.c:170
-#: g10/misc.c:242
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
@@ -4757,8 +4565,7 @@ msgstr "警告：不建议使用散列算法 %s\n"
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:448
-#: g10/sig-check.c:103
+#: g10/misc.c:448 g10/sig-check.c:103
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "请参见 %s 以得到更多信息。\n"
@@ -4880,14 +4687,11 @@ msgstr "不支持 gpg-agent 协议版本 %d\n"
 msgid "can't connect to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: g10/passphrase.c:379
-#: g10/passphrase.c:655
-#: g10/passphrase.c:745
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:532
-#: g10/passphrase.c:914
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主钥匙号 %s)"
@@ -4915,13 +4719,11 @@ msgstr "请输入密码\n"
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:805
-#: g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:968
 msgid "can't query passphrase in batch mode\n"
 msgstr "在批处理模式中无法查询密码\n"
 
-#: g10/passphrase.c:812
-#: g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "请输入密码："
 
@@ -4994,28 +4796,23 @@ msgstr "没有设置照片查看程序\n"
 msgid "unable to display photo ID!\n"
 msgstr "无法显示照片标识！\n"
 
-#: g10/pkclist.c:62
-#: g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:64
-#: g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "密钥被替换"
 
-#: g10/pkclist.c:66
-#: g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "密钥已泄漏"
 
-#: g10/pkclist.c:68
-#: g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "密钥不再使用"
 
-#: g10/pkclist.c:70
-#: g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "用户标识不再有效"
 
@@ -5042,7 +4839,8 @@ msgid "  aka \"%s\"\n"
 msgstr "  亦即“%s”\n"
 
 #: g10/pkclist.c:256
-msgid "How much do you trust that this key actually belongs to the named user?\n"
+msgid ""
+"How much do you trust that this key actually belongs to the named user?\n"
 msgstr "您是否相信这把密钥属于它所声称的持有者？\n"
 
 #: g10/pkclist.c:271
@@ -5081,8 +4879,7 @@ msgstr ""
 "这把密钥的最小信任等级为：%s\n"
 "\n"
 
-#: g10/pkclist.c:299
-#: g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "您的决定是什么？"
 
@@ -5180,7 +4977,8 @@ msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告：这把密钥未经受信任的签名认证！\n"
 
 #: g10/pkclist.c:604
-msgid "         There is no indication that the signature belongs to the owner.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
 msgstr "      没有证据表明这个签名属于它所声称的持有者。\n"
 
 #: g10/pkclist.c:612
@@ -5192,23 +4990,20 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "      这个签名很有可能是伪造的。\n"
 
 #: g10/pkclist.c:621
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告：这把密钥未经有足够信任度的签名所认证。\n"
 
 #: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      这份签名并不一定属于它所声称的持有者\n"
 
-#: g10/pkclist.c:822
-#: g10/pkclist.c:864
-#: g10/pkclist.c:1076
-#: g10/pkclist.c:1146
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s：已跳过：%s\n"
 
-#: g10/pkclist.c:834
-#: g10/pkclist.c:1114
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳过：公钥已存在\n"
@@ -5233,8 +5028,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "没有这个用户标识。\n"
 
-#: g10/pkclist.c:969
-#: g10/pkclist.c:1043
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳过：公钥已被设为默认收件者\n"
 
@@ -5264,9 +5058,7 @@ msgstr "没有有效的地址\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "数据未被保存；请用“--output”选项来保存它们\n"
 
-#: g10/plaintext.c:135
-#: g10/plaintext.c:140
-#: g10/plaintext.c:158
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
@@ -5324,12 +5116,8 @@ msgstr "注意：私钥 %s 已于 %s 过期\n"
 msgid "NOTE: key has been revoked"
 msgstr "注意：密钥已被吊销"
 
-#: g10/revoke.c:104
-#: g10/revoke.c:118
-#: g10/revoke.c:130
-#: g10/revoke.c:176
-#: g10/revoke.c:188
-#: g10/revoke.c:588
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失败：%s\n"
@@ -5351,13 +5139,11 @@ msgstr "(这是一把敏感的吊销密钥)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)"
 
-#: g10/revoke.c:329
-#: g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "已强行使用 ASCII 封装过的输出。\n"
 
-#: g10/revoke.c:344
-#: g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失败： %s\n"
@@ -5525,12 +5311,14 @@ msgstr "公钥 %s 在其签名后 %lu 秒生成\n"
 
 #: g10/sig-check.c:193
 #, c-format
-msgid "key %s was created %lu second in the future (time warp or clock problem)\n"
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
 #: g10/sig-check.c:195
 #, c-format
-msgid "key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
 #: g10/sig-check.c:205
@@ -5576,52 +5364,51 @@ msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入策略 URL\n"
 
 #: g10/sign.c:145
 #, c-format
-msgid "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告：无法 %%-扩展策略 URL (太大了)。现在使用未扩展的。\n"
 
 #: g10/sign.c:173
 #, c-format
-msgid "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
 msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA 要求使用 160 位的散列算法\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签名来自：“%s”\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做分离签名\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, c-format
-msgid "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "正在签名："
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明文签名\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
 
-#: g10/skclist.c:127
-#: g10/skclist.c:191
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用！\n"
 
@@ -5630,9 +5417,7 @@ msgstr "密钥未被标示为不安全――不能与假的随机数发生器共
 msgid "skipped \"%s\": duplicated\n"
 msgstr "“%s”已跳过：重复\n"
 
-#: g10/skclist.c:166
-#: g10/skclist.c:176
-#: g10/skclist.c:185
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "“%s”已跳过：%s\n"
@@ -5645,8 +5430,7 @@ msgstr "已跳过：私钥已存在\n"
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签名不安全！"
 
-#: g10/tdbdump.c:60
-#: g10/trustdb.c:366
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任记录 %lu，类别 %d：写入失败：%s\n"
@@ -5660,10 +5444,7 @@ msgstr ""
 "# 已指定的信任度的清单，建立于 %s \n"
 "# (请用“gpg --import-ownertrust”导入这些信任度)\n"
 
-#: g10/tdbdump.c:160
-#: g10/tdbdump.c:168
-#: g10/tdbdump.c:173
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "‘%s’中出错：%s\n"
@@ -5694,20 +5475,17 @@ msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 msgid "read error in `%s': %s\n"
 msgstr "读取‘%s’错误：%s\n"
 
-#: g10/tdbdump.c:228
-#: g10/trustdb.c:381
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数据库：同步失败：%s\n"
 
-#: g10/tdbio.c:129
-#: g10/tdbio.c:1445
+#: g10/tdbio.c:129 g10/tdbio.c:1445
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任度数据库记录 %lu：lseek 失败：%s\n"
 
-#: g10/tdbio.c:135
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:135 g10/tdbio.c:1452
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n"
@@ -5726,15 +5504,12 @@ msgstr "无法存取‘%s’：%s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s：目录不存在！\n"
 
-#: g10/tdbio.c:523
-#: g10/tdbio.c:546
-#: g10/tdbio.c:589
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "不能为‘%s’创建锁定\n"
 
-#: g10/tdbio.c:525
-#: g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "无法锁定‘%s’\n"
@@ -5773,13 +5548,8 @@ msgstr "%s：建立散列表失败：%s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s：更新版本记录时出错： %s\n"
 
-#: g10/tdbio.c:676
-#: g10/tdbio.c:696
-#: g10/tdbio.c:712
-#: g10/tdbio.c:726
-#: g10/tdbio.c:756
-#: g10/tdbio.c:1378
-#: g10/tdbio.c:1405
+#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
+#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s：读取版本记录时出错： %s\n"
@@ -5901,8 +5671,7 @@ msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
 msgid "[ revoked]"
 msgstr "[已吊销]"
 
-#: g10/trustdb.c:509
-#: g10/trustdb.c:514
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[已过期]"
 
@@ -5950,8 +5719,7 @@ msgstr "绝对"
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:583
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
@@ -5966,8 +5734,7 @@ msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
 
-#: g10/trustdb.c:839
-#: g10/trustdb.c:1277
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公钥 %s：%s\n"
@@ -6001,8 +5768,10 @@ msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
 
 #: g10/trustdb.c:2283
 #, c-format
-msgid "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
-msgstr "深度：%d 有效性：%3d 已签名：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+"深度：%d 有效性：%3d 已签名：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
 
 #: g10/trustdb.c:2358
 #, c-format
@@ -6263,24 +6032,20 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "您找到一个程序缺陷了……(%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330
-#: util/miscutil.c:367
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:331
-#: util/miscutil.c:372
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333
-#: util/miscutil.c:369
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:334
-#: util/miscutil.c:373
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
@@ -6327,3 +6092,5 @@ msgstr "安全内存未初始化，不能进行操作\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(您可能使用了错误的程序来完成此项任务)\n"
 
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA 要求使用 160 位的散列算法\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 56d44b29f..6b07d4492 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-06-25 13:35+0200\n"
-"PO-Revision-Date: 2005-06-23 02:36+0800\n"
+"POT-Creation-Date: 2006-07-26 12:43+0200\n"
+"PO-Revision-Date: 2005-07-29 09:49+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -45,8 +45,8 @@ msgstr "正在將私鑰寫至 `%s'\n"
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
 #: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
+#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -81,7 +81,7 @@ msgstr "請注意: random_seed 檔案未被更新\n"
 
 #: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
 #: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
@@ -717,7 +717,7 @@ msgstr "--output 在這個命令中沒有作用\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "金鑰 \"%s\" 找不到: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -757,7 +757,7 @@ msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213 g10/sign.c:1284
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
@@ -776,7 +776,7 @@ msgstr "正在使用編密法 %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是一個空檔案\n"
@@ -801,7 +801,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用對稱式編密法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628 g10/sign.c:963
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2261,265 +2261,270 @@ msgid "      user IDs cleaned: %lu\n"
 msgstr " 已被清除掉的使用者 ID: %lu\n"
 
 #: g10/import.c:566
-#, fuzzy, c-format
-msgid ""
-"WARNING: key %s contains preferences for unavailable\n"
-"algorithms on these user IDs:\n"
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "警告: 金鑰 %s 含有不可用的偏好設定\n"
 
-#: g10/import.c:604
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:570
+#, fuzzy
+msgid "         algorithms on these user IDs:\n"
+msgstr "這些使用者 ID 上的演算法:\n"
+
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": 編密演算法 %s 的偏好設定\n"
 
-#: g10/import.c:616
+#: g10/import.c:619
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": 摘要演算法 %s 的偏好設定\n"
 
-#: g10/import.c:628
+#: g10/import.c:631
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
 
-#: g10/import.c:641
+#: g10/import.c:644
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "我們強烈建議妳更新妳的偏好設定, 並\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "重新散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 
-#: g10/import.c:667
+#: g10/import.c:670
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "妳可以像這樣更新妳的偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:720 g10/import.c:1118
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
 
-#: g10/import.c:746
+#: g10/import.c:749
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 
-#: g10/import.c:761
+#: g10/import.c:764
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "金鑰 %s: 非自我簽署的使用者 ID \"%s\" 已被接受\n"
 
-#: g10/import.c:767
+#: g10/import.c:770
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能是由於遺失自我簽章所導致的後果\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:782 g10/import.c:1240
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:788
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 
-#: g10/import.c:794
+#: g10/import.c:797
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在寫到 `%s'\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
+#: g10/import.c:2363 g10/import.c:2385
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/import.c:822
+#: g10/import.c:825
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "金鑰 %s: 公鑰 \"%s\" 已被匯入\n"
 
-#: g10/import.c:846
+#: g10/import.c:849
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:866 g10/import.c:1258
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定位原始的金鑰區塊: %s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:874 g10/import.c:1265
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 
-#: g10/import.c:908
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
-#: g10/import.c:911
+#: g10/import.c:914
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 
-#: g10/import.c:914
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的簽章\n"
 
-#: g10/import.c:917
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的簽章\n"
 
-#: g10/import.c:920
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的子鑰\n"
 
-#: g10/import.c:923
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的子鑰\n"
 
-#: g10/import.c:926
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/import.c:929
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/import.c:932
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
 
-#: g10/import.c:935
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
 
-#: g10/import.c:958
+#: g10/import.c:961
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "金鑰 %s: \"%s\" 沒有被改變\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "金鑰 %s: 私鑰使用了無效的編密法 %d - 已跳過\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1135
 msgid "importing secret keys not allowed\n"
 msgstr "未被允許匯入私鑰\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1152 g10/import.c:2378
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
 
-#: g10/import.c:1160
+#: g10/import.c:1163
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "金鑰 %s: 私鑰被匯入了\n"
 
-#: g10/import.c:1190
+#: g10/import.c:1193
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "金鑰 %s: 已經在私鑰鑰匙圈中了\n"
 
-#: g10/import.c:1200
+#: g10/import.c:1203
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "金鑰 %s: 找不到私鑰: %s\n"
 
-#: g10/import.c:1230
+#: g10/import.c:1233
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:1273
+#: g10/import.c:1276
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 
-#: g10/import.c:1305
+#: g10/import.c:1308
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "金鑰 %s: \"%s\" 撤銷憑證已被匯入\n"
 
-#: g10/import.c:1371
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 使用了未被支援的公鑰演算法\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 有無效的自我簽章\n"
 
-#: g10/import.c:1406
+#: g10/import.c:1409
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有子鑰可供附帶\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1420 g10/import.c:1470
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未被支援的公鑰演算法\n"
 
-#: g10/import.c:1419
+#: g10/import.c:1422
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "金鑰 %s: 無效的附帶子鑰\n"
 
-#: g10/import.c:1434
+#: g10/import.c:1437
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "金鑰 %s: 多重附帶子鑰已被移除\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 
-#: g10/import.c:1469
+#: g10/import.c:1472
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 
-#: g10/import.c:1484
+#: g10/import.c:1487
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 
-#: g10/import.c:1526
+#: g10/import.c:1529
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "金鑰 %s: 子鑰已跳過\n"
@@ -2528,65 +2533,65 @@ msgstr "金鑰 %s: 子鑰已跳過\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1574
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "金鑰 %s: 不可匯出的簽章 (等級 %02X) - 已跳過\n"
+msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
 
-#: g10/import.c:1584
+#: g10/import.c:1587
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1601
+#: g10/import.c:1604
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 
-#: g10/import.c:1615
+#: g10/import.c:1618
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1623
+#: g10/import.c:1626
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 
-#: g10/import.c:1723
+#: g10/import.c:1726
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:1785
+#: g10/import.c:1788
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 
-#: g10/import.c:1799
+#: g10/import.c:1802
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 
-#: g10/import.c:1858
+#: g10/import.c:1861
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:1892
+#: g10/import.c:1895
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2284
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "請注意: 某份金鑰的序號 (S/N) 與卡片的序號並不吻合\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2292
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "請注意: 主鑰在線上且已存放於卡片上了\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "請注意: 次鑰在線上且已存放於卡片上了\n"
 
@@ -2882,7 +2887,7 @@ msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
 #: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:4999 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
@@ -3131,9 +3136,8 @@ msgid "Really sign all user IDs? (y/N) "
 msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
 #: g10/keyedit.c:1762
-#, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
-msgstr "用信任簽章來簽署所選的使用者 ID"
+msgstr "提示: 選擇使用者 ID 來加以簽署\n"
 
 #: g10/keyedit.c:1771
 #, c-format
@@ -4069,17 +4073,17 @@ msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3507
+#: g10/keygen.c:3509
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:3554
+#: g10/keygen.c:3556
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:3580
+#: g10/keygen.c:3582
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
@@ -5417,39 +5421,35 @@ msgid ""
 "unexpanded.\n"
 msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:339
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
-
-#: g10/sign.c:369
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: g10/sign.c:378
+#: g10/sign.c:356
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
 
-#: g10/sign.c:810
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做分離簽署\n"
 
-#: g10/sign.c:879
+#: g10/sign.c:862
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
-#: g10/sign.c:992
+#: g10/sign.c:988
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1104
+#: g10/sign.c:1100
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做明文簽署\n"
 
-#: g10/sign.c:1282
+#: g10/sign.c:1278
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
@@ -6138,13 +6138,6 @@ msgstr "尚未啟用安全的記憶體前, 不可能進行操作\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(也許妳選錯程式來做這件事了)\n"
 
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "這些使用者 ID 上的演算法:\n"
-
-#~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-#~ msgstr "請參考 http://www.gnupg.org/why-not-idea.html 取得更多資訊\n"
-
 #~ msgid ""
 #~ "a notation name must have only printable characters or spaces, and end "
 #~ "with an '='\n"
@@ -6165,6 +6158,9 @@ msgstr "(也許妳選錯程式來做這件事了)\n"
 #~ msgid "not human readable"
 #~ msgstr "不是人類能讀得懂的"
 
-#  of subkey
-#~ msgid "expired: %s)"
-#~ msgstr "已過期: %s)"
+#~ msgid ""
+#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ msgstr "請參考 http://www.gnupg.org/why-not-idea.html 取得更多資訊\n"
+
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA 要求使用 160 位元的雜湊演算法\n"