* primegen.c (is_prime): Free A2. Noted by [email protected].

Fixes #423.

* DETAILS: Document new status codes.

* cardglue.c (agent_scd_pkdecrypt, agent_scd_pksign)
(agent_scd_genkey, agent_scd_setattr, agent_scd_change_pin)
(agent_scd_checkpin, agent_openpgp_storekey): Make sure to send a
SC_OP_FAILURE after card operations which might change data.
* card-util.c (change_pin): Send a SC_OP_SUCCESS after a PIN has
been changed.
(change_name): Removed a debug output.
* status.h, status.c: New codes BAD_PASSPHRASE_PIN, SC_OP_FAILURE
and SC_OP_SUCCESS.

* de.po: Updated. Translation is still in the works, though.

11 files changed, 420 insertions, 394 deletions

diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index 082c2581c..9965eed4b 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-07  Werner Koch  <[email protected]>
+
+	* primegen.c (is_prime): Free A2.  Noted by [email protected].
+	Fixes #423.
+
 2004-11-30  David Shaw  <[email protected]>
 
 	* md.c (string_to_digest_algo): Allow read/write SHA384 and
diff --git a/cipher/primegen.c b/cipher/primegen.c
index 22b9bc455..dda9012b5 100644
--- a/cipher/primegen.c
+++ b/cipher/primegen.c
@@ -462,15 +462,16 @@ is_prime( MPI n, int steps, int *count )
 	    mpi_set_ui( x, 2 );
 	}
 	else {
-	    /*mpi_set_bytes( x, nbits-1, get_random_byte, 0 );*/
-	    {	char *p = get_random_bits( nbits, 0, 0 );
-		mpi_set_buffer( x, p, (nbits+7)/8, 0 );
-		m_free(p);
-	    }
-	    /* make sure that the number is smaller than the prime
-	     * and keep the randomness of the high bit */
+            char *p;
+            
+            p = get_random_bits( nbits, 0, 0 );
+            mpi_set_buffer( x, p, (nbits+7)/8, 0 );
+            m_free(p);
+
+	    /* Make sure that the number is smaller than the prime
+	     * and keep the randomness of the high bit.  */
 	    if( mpi_test_bit( x, nbits-2 ) ) {
-		mpi_set_highbit( x, nbits-2 ); /* clear all higher bits */
+		mpi_set_highbit( x, nbits-2 ); /* Clear all higher bits */
 	    }
 	    else {
 		mpi_set_highbit( x, nbits-2 );
@@ -498,6 +499,7 @@ is_prime( MPI n, int steps, int *count )
     mpi_free( z );
     mpi_free( nminus1 );
     mpi_free( q );
+    mpi_free (a2);
 
     return rc;
 }
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 599e64310..7b003b1ff 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-07  Werner Koch  <[email protected]>
+
+	* DETAILS: Document new status codes.
+
 2005-02-15  Werner Koch  <[email protected]>
 
 	* faq.raw: Add htmlcharset header line as suggested by Maxim
@@ -6,7 +10,6 @@
 
 	* gpg.ru.sgml: Updated from upstream.  Added a closing PARA.
 	
-
 	* gpg.sgml: Add bkuptocard command for --edit-key.
 
 2005-02-05  David Shaw  <[email protected]>
diff --git a/doc/DETAILS b/doc/DETAILS
index 5b7fce189..8148a4def 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -349,6 +349,9 @@ more arguments in future versions.
 	The supplied passphrase was good and the secret key material
 	is therefore usable.
 
+    BAD_PASSPHRASE_PIN
+        Reserved for future use.
+
     DECRYPTION_FAILED
 	The symmetric decryption failed - one reason could be a wrong
 	passphrase for a symmetrical encrypted message.
@@ -570,6 +573,16 @@ more arguments in future versions.
         This indicates that a signature subpacket was seen.  The
         format is the same as the "spk" record above.
 
+    SC_OP_FAILURE
+        An operation on a smartcard definitely failed.  Currently
+        there is no indication of the actual error code, but
+        application should be prepared to later accept more arguments.
+
+    SC_OP_SUCCESS
+        A smart card operaion succeeded.  This status is only printed
+        for certain operation and is mostly useful to check whether a
+        PIN change really worked.
+
 
 Format of the "--attribute-fd" output
 =====================================
diff --git a/g10/ChangeLog b/g10/ChangeLog
index cd0da9464..3ffe66fce 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,15 @@
+2005-03-07  Werner Koch  <[email protected]>
+
+	* cardglue.c (agent_scd_pkdecrypt, agent_scd_pksign) 
+	(agent_scd_genkey, agent_scd_setattr, agent_scd_change_pin) 
+	(agent_scd_checkpin, agent_openpgp_storekey): Make sure to send a
+	SC_OP_FAILURE after card operations which might change data.
+	* card-util.c (change_pin): Send a SC_OP_SUCCESS after a PIN has
+	been changed.
+	(change_name): Removed a debug output.
+	* status.h, status.c: New codes BAD_PASSPHRASE_PIN, SC_OP_FAILURE
+	and SC_OP_SUCCESS.
+
 2005-02-24  David Shaw  <[email protected]>
 
 	* keyedit.c (keyedit_menu): Only print the key signing hint when
diff --git a/g10/card-util.c b/g10/card-util.c
index cbf8ec606..5c0f76b93 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -77,7 +77,10 @@ change_pin (int chvno, int allow_admin)
       if (rc)
 	tty_printf ("Error changing the PIN: %s\n", gpg_strerror (rc));
       else
-	tty_printf ("PIN changed.\n");
+        {
+          write_status (STATUS_SC_OP_SUCCESS);
+          tty_printf ("PIN changed.\n");
+        }
     }
   else
     for (;;)
@@ -103,7 +106,10 @@ change_pin (int chvno, int allow_admin)
 	    if (rc)
 	      tty_printf ("Error changing the PIN: %s\n", gpg_strerror (rc));
 	    else
-	      tty_printf ("PIN changed.\n");
+              {
+                write_status (STATUS_SC_OP_SUCCESS);
+                tty_printf ("PIN changed.\n");
+              }
 	  }
 	else if (*answer == '2')
 	  {
@@ -111,15 +117,21 @@ change_pin (int chvno, int allow_admin)
 	    if (rc)
 	      tty_printf ("Error unblocking the PIN: %s\n", gpg_strerror (rc));
 	    else
-	      tty_printf ("PIN unblocked and new PIN set.\n");
-	  }
+              {
+                write_status (STATUS_SC_OP_SUCCESS);
+                tty_printf ("PIN unblocked and new PIN set.\n");
+              }
+          }
 	else if (*answer == '3')
 	  {
 	    rc = agent_scd_change_pin (3);
 	    if (rc)
 	      tty_printf ("Error changing the PIN: %s\n", gpg_strerror (rc));
 	    else
-	      tty_printf ("PIN changed.\n");
+              {
+                write_status (STATUS_SC_OP_SUCCESS);
+                tty_printf ("PIN changed.\n");
+              }
 	  }
 	else if (*answer == 'q' || *answer == 'Q')
 	  {
@@ -529,7 +541,6 @@ change_name (void)
       return -1;
     }
 
-  log_debug ("setting Name to `%s'\n", isoname);
   rc = agent_scd_setattr ("DISP-NAME", isoname, strlen (isoname) );
   if (rc)
     log_error ("error setting Name: %s\n", gpg_strerror (rc));
diff --git a/g10/cardglue.c b/g10/cardglue.c
index a28f1c079..a700a34d1 100644
--- a/g10/cardglue.c
+++ b/g10/cardglue.c
@@ -1,5 +1,5 @@
 /* cardglue.c - mainly dispatcher for card related functions.
- * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -737,12 +737,17 @@ agent_scd_setattr (const char *name,
                    const unsigned char *value, size_t valuelen)
 {
   APP app;
+  int rc;
 
   app = current_app? current_app : open_card ();
   if (!app)
     return gpg_error (GPG_ERR_CARD);
 
-  return app->fnc.setattr (app, name, pin_cb, NULL, value, valuelen);
+  rc = app->fnc.setattr (app, name, pin_cb, NULL, value, valuelen);
+
+  if (rc)
+    write_status (STATUS_SC_OP_FAILURE);
+  return rc;
 }
 
 
@@ -805,6 +810,7 @@ agent_scd_genkey (struct agent_card_genkey_s *info, int keyno, int force)
   APP app;
   char keynostr[20];
   struct ctrl_ctx_s ctrl;
+  int rc;
 
   app = current_app? current_app : open_card ();
   if (!app)
@@ -815,9 +821,12 @@ agent_scd_genkey (struct agent_card_genkey_s *info, int keyno, int force)
   ctrl.status_cb = genkey_status_cb;
   ctrl.status_cb_arg = info;
 
-  return app->fnc.genkey (app, &ctrl, keynostr,
-                           force? 1:0,
-                           pin_cb, NULL);
+  rc = app->fnc.genkey (app, &ctrl, keynostr,
+                        force? 1:0,
+                        pin_cb, NULL);
+  if (rc)
+    write_status (STATUS_SC_OP_FAILURE);
+  return rc;
 }
 
 /* Send a PKSIGN command to the SCdaemon. */
@@ -840,13 +849,15 @@ agent_scd_pksign (const char *serialno, int hashalgo,
   rc = check_card_serialno (app, serialno);
   if (rc == -1)
     goto retry;
-  if (rc)
-    return rc;
 
-  return app->fnc.sign (app, serialno, hashalgo,
+  if (!rc)
+    rc = app->fnc.sign (app, serialno, hashalgo,
                         pin_cb, NULL,
                         indata, indatalen,
                         r_buf, r_buflen);
+  if (rc)
+    write_status (STATUS_SC_OP_FAILURE);
+  return rc;
 }
 
 
@@ -870,13 +881,15 @@ agent_scd_pkdecrypt (const char *serialno,
   rc = check_card_serialno (app, serialno);
   if (rc == -1)
     goto retry;
-  if (rc)
-    return rc;
 
-  return app->fnc.decipher (app, serialno, 
+  if (!rc)
+    rc = app->fnc.decipher (app, serialno, 
                             pin_cb, NULL,
                             indata, indatalen,
                             r_buf, r_buflen);
+  if (rc)
+    write_status (STATUS_SC_OP_FAILURE);
+  return rc;
 }
 
 /* Change the PIN of an OpenPGP card or reset the retry counter. */
@@ -886,6 +899,7 @@ agent_scd_change_pin (int chvno)
   APP app;
   char chvnostr[20];
   int reset = 0;
+  int rc;
 
   reset = (chvno >= 100);
   chvno %= 100;
@@ -895,8 +909,11 @@ agent_scd_change_pin (int chvno)
     return gpg_error (GPG_ERR_CARD);
 
   sprintf (chvnostr, "%d", chvno);
-  return app->fnc.change_pin (app, NULL, chvnostr, reset,
-                              pin_cb, NULL);
+  rc = app->fnc.change_pin (app, NULL, chvnostr, reset,
+                            pin_cb, NULL);
+  if (rc)
+    write_status (STATUS_SC_OP_FAILURE);
+  return rc;
 }
 
 /* Perform a CHECKPIN operation.  SERIALNO should be the serial
@@ -906,12 +923,16 @@ int
 agent_scd_checkpin (const char *serialnobuf)
 {
   APP app;
+  int rc;
 
   app = current_app? current_app : open_card ();
   if (!app)
     return gpg_error (GPG_ERR_CARD);
 
-  return app->fnc.check_pin (app, serialnobuf, pin_cb, NULL);
+  rc = app->fnc.check_pin (app, serialnobuf, pin_cb, NULL);
+  if (rc)
+    write_status (STATUS_SC_OP_FAILURE);
+  return rc;
 }
 
 
@@ -924,12 +945,16 @@ agent_openpgp_storekey (int keyno,
                         const unsigned char *e, size_t elen)
 {
   APP app;
+  int rc;
 
   app = current_app? current_app : open_card ();
   if (!app)
     return gpg_error (GPG_ERR_CARD);
 
-  return app_openpgp_storekey (app, keyno, template, template_len,
-                               created_at, m, mlen, e, elen,
-                               pin_cb, NULL);
+  rc = app_openpgp_storekey (app, keyno, template, template_len,
+                             created_at, m, mlen, e, elen,
+                             pin_cb, NULL);
+  if (rc)
+    write_status (STATUS_SC_OP_FAILURE);
+  return rc;
 }
diff --git a/g10/status.c b/g10/status.c
index 1386ca91f..342622601 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -112,6 +112,7 @@ get_status_string ( int no )
     case STATUS_ENC_TO	 : s = "ENC_TO"; break;
     case STATUS_NODATA	 : s = "NODATA"; break;
     case STATUS_BAD_PASSPHRASE : s = "BAD_PASSPHRASE"; break;
+    case STATUS_BAD_PASSPHRASE_PIN: s = "BAD_PASSPHRASE_PIN"; break;
     case STATUS_NO_PUBKEY	 : s = "NO_PUBKEY"; break;
     case STATUS_NO_SECKEY	 : s = "NO_SECKEY"; break;
     case STATUS_NEED_PASSPHRASE_SYM: s = "NEED_PASSPHRASE_SYM"; break;
@@ -159,6 +160,8 @@ get_status_string ( int no )
     case STATUS_PLAINTEXT      : s = "PLAINTEXT"; break;
     case STATUS_PLAINTEXT_LENGTH:s = "PLAINTEXT_LENGTH"; break;
     case STATUS_SIG_SUBPACKET  : s = "SIG_SUBPACKET"; break;
+    case STATUS_SC_OP_SUCCESS  : s = "SC_OP_SUCCESS"; break;
+    case STATUS_SC_OP_FAILURE  : s = "SC_OP_FAILURE"; break;
     default: s = "?"; break;
     }
   return s;
diff --git a/g10/status.h b/g10/status.h
index 67a889a9a..629c28afb 100644
--- a/g10/status.h
+++ b/g10/status.h
@@ -107,6 +107,13 @@
 #define STATUS_NEED_PASSPHRASE_PIN 76
 #define STATUS_SIG_SUBPACKET    77
 
+/* Extra status codes for certain smartcard operations.  Primary
+   useful to double check that change PIN worked as expected.  */
+#define STATUS_BAD_PASSPHRASE_PIN 78
+#define STATUS_SC_OP_FAILURE    79
+#define STATUS_SC_OP_SUCCESS    80
+
+
 /*-- status.c --*/
 void set_status_fd ( int fd );
 int  is_status_enabled ( void );
diff --git a/po/de.po b/po/de.po
index d6a4a4eb4..7881272c9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,14 @@
 # GnuPG german translation
 # Copyright (C) 1998, 1999, 2000, 2001, 2002,
-#               2003 Free Software Foundation, Inc.
-# Walter Koch <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003
+#               2003, 2004, 2005 Free Software Foundation, Inc.
+# Walter Koch <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-1.2.2\n"
+"Project-Id-Version: gnupg-1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-02-16 21:13+0100\n"
-"PO-Revision-Date: 2005-02-16 20:36+0100\n"
+"POT-Creation-Date: 2005-03-06 13:33+0100\n"
+"PO-Revision-Date: 2005-03-06 13:39+0100\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -138,12 +138,12 @@ msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 #: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
-msgstr ""
+msgstr "PIN-Callback meldete Fehler: %s\n"
 
 #: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
+msgstr "PIN f�r CHV%d ist zu kurz; die Mindestl�nge betr�gt %d\n"
 
 #: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
 #: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
@@ -153,35 +153,35 @@ msgstr "Pr�fung des CHV%d fehlgeschlagen: %s\n"
 
 #: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
-msgstr ""
+msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
 #: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
-msgstr ""
+msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
 
 #: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
-msgstr ""
+msgstr "Karte ist dauerhaft gesperrt!\n"
 
 #: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
+msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft geperrt ist\n"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
 #: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
-msgstr ""
+msgstr "|A|Admin-PIN"
 
 #: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
-msgstr ""
+msgstr "AN|Neue Admin-PIN"
 
 #: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
-msgstr ""
+msgstr "|N|Neue PIN"
 
 #: g10/app-openpgp.c:1022
 #, c-format
@@ -189,58 +189,53 @@ msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
 
 #: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
-#, fuzzy
 msgid "error reading application data\n"
-msgstr "Fehler beim Lesen des Schl�sselblocks: %s\n"
+msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
 #: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
-#, fuzzy
 msgid "error reading fingerprint DO\n"
-msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
+msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
 #: g10/app-openpgp.c:1104
-#, fuzzy
 msgid "key already exists\n"
-msgstr "`%s' ist bereits komprimiert\n"
+msgstr "Shl�ssel existiert bereits\n"
 
 #: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
-msgstr ""
+msgstr "Existierender Schl�ssel wird ersetzt werden\n"
 
 #: g10/app-openpgp.c:1110
-#, fuzzy
 msgid "generating new key\n"
-msgstr "Ein neues Schl�sselpaar erzeugen"
+msgstr "neue Schl�ssel werden erzeugt\n"
 
 #: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
-msgstr ""
+msgstr "Bitte warten, der Schl�ssel wird erzeugt ...\n"
 
 #: g10/app-openpgp.c:1135
-#, fuzzy
 msgid "generating key failed\n"
-msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
+msgstr "Schl�sselerzeugung fehlgeschlagen\n"
 
 #: g10/app-openpgp.c:1138
-#, fuzzy, c-format
+#, c-format
 msgid "key generation completed (%d seconds)\n"
-msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
+msgstr "Schl�sselerzeugung abgeschlossen (%d Sekunden)\n"
 
 #: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
-msgstr ""
+msgstr "Die Antwort enth�lt keine �ffentliche Schl�ssel-Daten\n"
 
 #: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
-msgstr ""
+msgstr "Die Antwort enth�lt das RSA-Modulus nicht\n"
 
 #: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
-msgstr ""
+msgstr "Antwort enth�lt den �ffentlichen RSA-Exponenten nicht\n"
 
 #: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
+msgstr "Ung�ltige Struktur der OpenPGP-Karte (DO 0x93)}\n"
 
 #: g10/app-openpgp.c:1356
 #, c-format
@@ -253,24 +248,23 @@ msgid "PIN [sigs done: %lu]"
 msgstr ""
 
 #: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
-#, fuzzy, c-format
+#, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
+msgstr "Kann auf %s nicht zugreifen - ung�ltige OpenPGP-Karte?\n"
 
 #: g10/app-openpgp.c:1731
-#, fuzzy, c-format
+#, c-format
 msgid "error getting serial number: %s\n"
-msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
+msgstr "Fehler beim Holen der Seriennummer: %s\n"
 
 #: g10/app-openpgp.c:1826
-#, fuzzy, c-format
+#, c-format
 msgid "failed to store the key: %s\n"
-msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
+msgstr "Speichern des Schl�ssels fehlgeschlagen: %s\n"
 
 #: g10/app-openpgp.c:1868
-#, fuzzy
 msgid "reading the key failed\n"
-msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
+msgstr "Lesen des Schl�ssels fehlgeschlagen: %s\n"
 
 #: g10/armor.c:317
 #, c-format
@@ -370,65 +364,61 @@ msgstr "Ihre Auswahl? "
 
 #: g10/card-util.c:194 g10/card-util.c:244
 msgid "[not set]"
-msgstr ""
+msgstr "[nicht gesetzt]"
 
 #: g10/card-util.c:379
-#, fuzzy
 msgid "male"
-msgstr "enable"
+msgstr "m�nnlich"
 
 #: g10/card-util.c:380
-#, fuzzy
 msgid "female"
-msgstr "enable"
+msgstr "weiblich"
 
 #: g10/card-util.c:380
 msgid "unspecified"
 msgstr "unbestimmt"
 
 #: g10/card-util.c:407
-#, fuzzy
 msgid "not forced"
-msgstr "nicht bearbeitet"
+msgstr "nicht zwingend"
 
 #: g10/card-util.c:407
 msgid "forced"
-msgstr ""
+msgstr "zwingend"
 
 #: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr ""
+msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
 
 #: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
-msgstr ""
+msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
 
 #: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
-msgstr ""
+msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
 
 #: g10/card-util.c:506
 msgid "Cardholder's surname: "
-msgstr ""
+msgstr "Familienname des Kartenbesitzers:"
 
 #: g10/card-util.c:508
 msgid "Cardholder's given name: "
-msgstr ""
+msgstr "Vorname des Kartenbesitzers:"
 
 #: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Fehler: Der zusammengesetzte Name ist zu lang (Grenze betr�gt %d Zeichen).\n"
 
 #: g10/card-util.c:548
-#, fuzzy
 msgid "URL to retrieve public key: "
-msgstr "kein zugeh�riger �ffentlicher Schl�ssel: %s\n"
+msgstr "URL um den �ffentlichen Schl�ssel zu holen: "
 
 #: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Fehler: URL ist zu lang (Grenze betr�gt %d Zeichen).\n"
 
 #: g10/card-util.c:654 g10/card-util.c:723 g10/import.c:261
 #, c-format
@@ -437,83 +427,75 @@ msgstr "Fehler beim Lesen von `%s': %s\n"
 
 #: g10/card-util.c:662
 msgid "Login data (account name): "
-msgstr ""
+msgstr "Logindaten (Kontenname): "
 
 #: g10/card-util.c:672
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Fehler: Logindaten sind zu lang (Grenze betr�gt %d Zeichen).\n"
 
 #: g10/card-util.c:731
 msgid "Private DO data: "
-msgstr ""
+msgstr "Geheime DO-Daten: "
 
 #: g10/card-util.c:741
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Fehler: Geheime DO-Daten sind zu lang (Grenze betr�gt %d Zeichen).\n"
 
 #: g10/card-util.c:761
-#, fuzzy
 msgid "Language preferences: "
-msgstr "ge�nderte Voreinstellungen"
+msgstr "Spracheinstellungen"
 
 #: g10/card-util.c:769
-#, fuzzy
 msgid "Error: invalid length of preference string.\n"
-msgstr "Ung�ltiges Feld in der Voreinstellungszeichenkette\n"
+msgstr "Fehler: Ung�ltige L�nge der Einstellungs-Zeichenfolge.\n"
 
 #: g10/card-util.c:778
-#, fuzzy
 msgid "Error: invalid characters in preference string.\n"
-msgstr "Ung�ltiges Feld in der Voreinstellungszeichenkette\n"
+msgstr "Fehler: Ung�ltige Zeichen in der Einstellungs-Zeichenfolge\n"
 
 #: g10/card-util.c:799
 msgid "Sex ((M)ale, (F)emale or space): "
-msgstr ""
+msgstr "Geschlecht: (M�nnlich (M), Weiblich (F) oder Leerzeichen): "
 
 #: g10/card-util.c:813
-#, fuzzy
 msgid "Error: invalid response.\n"
-msgstr "Fehler: ung�ltiger Fingerabdruck\n"
+msgstr "Fehler: ung�ltige Antwort.\n"
 
 #: g10/card-util.c:834
 msgid "CA fingerprint: "
-msgstr "CA Fingerabdruck: "
+msgstr "CA-Fingerabdruck: "
 
 #: g10/card-util.c:857
-#, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "Fehler: ung�ltiger Fingerabdruck\n"
+msgstr "Fehler: ung�ltig geformter Fingerabdruck.\n"
 
 #: g10/card-util.c:905
-#, fuzzy, c-format
+#, c-format
 msgid "key operation not possible: %s\n"
-msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
+msgstr "Schl�sseloperation nicht m�glich: %s\n"
 
 #: g10/card-util.c:906
-#, fuzzy
 msgid "not an OpenPGP card"
-msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
+msgstr "Keine g�ltige OpenPGP-Karte"
 
 #: g10/card-util.c:915
-#, fuzzy, c-format
+#, c-format
 msgid "error getting current key info: %s\n"
-msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
+msgstr "Fehler beim Holen der aktuellen Schl�sselinfo: %s\n"
 
 #: g10/card-util.c:998
-#, fuzzy
 msgid "Replace existing key? (y/N) "
-msgstr "Wirklich unterschreiben? (j/N) "
+msgstr "Vorhandenen Schl�ssel ersetzen? (j/N) "
 
 #: g10/card-util.c:1019 g10/card-util.c:1028
 msgid "Make off-card backup of encryption key? (Y/n) "
-msgstr ""
+msgstr "Sicherung des Verschl�sselungsschl�ssel ausserhalb der Karte erstellen? (J/n) "
 
 #: g10/card-util.c:1040
-#, fuzzy
 msgid "Replace existing keys? (y/N) "
-msgstr "Wirklich unterschreiben? (j/N) "
+msgstr "Vorhandene Schl�ssel ersetzen? (j/N) "
 
 #: g10/card-util.c:1049
 #, c-format
@@ -522,25 +504,25 @@ msgid ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "You should change them using the command --change-pin\n"
 msgstr ""
+"Bitte beachten: Die Werkseinstellung der PINs sind\n"
+"   PIN = `%s'     Admin-PIN = `%s'\n"
+"Sie sollten sie mittels des Kommandos --change-pin �ndern\n"
 
 #: g10/card-util.c:1088
-#, fuzzy
 msgid "Please select the type of key to generate:\n"
-msgstr "Bitte w�hlen Sie, welche Art von Schl�ssel Sie m�chten:\n"
+msgstr "Bitte w�hlen Sie die Art des Schl�ssel, der erzeugt werden soll:\n"
 
 #: g10/card-util.c:1090 g10/card-util.c:1171
-#, fuzzy
 msgid "   (1) Signature key\n"
-msgstr "Diese Unterschrift ist seit %s verfallen.\n"
+msgstr "   (1) Unterschriften-Schl�ssel\n"
 
 #: g10/card-util.c:1091 g10/card-util.c:1173
-#, fuzzy
 msgid "   (2) Encryption key\n"
-msgstr "   (%d) RSA (nur verschl�sseln)\n"
+msgstr "   (2) Verschl�sselungs-Schl�ssel\n"
 
 #: g10/card-util.c:1092 g10/card-util.c:1175
 msgid "   (3) Authentication key\n"
-msgstr ""
+msgstr "   (3) Authentisierungs-Schl�ssel\n"
 
 #: g10/card-util.c:1108 g10/card-util.c:1191 g10/keyedit.c:908
 #: g10/keygen.c:1404 g10/revoke.c:642
@@ -548,153 +530,136 @@ msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
 #: g10/card-util.c:1168
-#, fuzzy
 msgid "Please select where to store the key:\n"
-msgstr "Grund f�r den Widerruf:\n"
+msgstr "W�hlen Sie den Speicherort f�r den Schl�ssel:\n"
 
 #: g10/card-util.c:1203
-#, fuzzy
 msgid "unknown key protection algorithm\n"
-msgstr "Unbekanntes Schutzverfahren\n"
+msgstr "Unbekanntes Schl�ssel-Schutzverfahren\n"
 
 #: g10/card-util.c:1208
-#, fuzzy
 msgid "secret parts of key are not available\n"
-msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
+msgstr "Geheime Teile des Schl�ssels sind nicht vorhanden\n"
 
 #: g10/card-util.c:1213
-#, fuzzy
 msgid "secret key already stored on a card\n"
-msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
+msgstr "geheimer Schl�ssel ist bereits auf einer Karte gepeichert\n"
 
 #: g10/card-util.c:1283 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
 #: g10/card-util.c:1285
-#, fuzzy
 msgid "show admin commands"
-msgstr "Widerspr�chliche Befehle\n"
+msgstr "Zeige Admin-Kommandos"
 
 #: g10/card-util.c:1286 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
 #: g10/card-util.c:1288
-#, fuzzy
 msgid "list all available data"
-msgstr "Schl�ssel erh�ltlich bei: "
+msgstr "Alle vorhandenen Daten auflisten"
 
 #: g10/card-util.c:1291
 msgid "change card holder's name"
-msgstr ""
+msgstr "Kartenbesitzernamen �ndern"
 
 #: g10/card-util.c:1292
 msgid "change URL to retrieve key"
-msgstr ""
+msgstr "Schl�ssel-holen-URL �ndern"
 
 #: g10/card-util.c:1293
 msgid "fetch the key specified in the card URL"
-msgstr ""
+msgstr "Holen des Schl�ssels mittels der URL auf der Karte"
 
 #: g10/card-util.c:1294
-#, fuzzy
 msgid "change the login name"
-msgstr "�ndern des Verfallsdatums"
+msgstr "�ndern der Logindaten"
 
 #: g10/card-util.c:1295
-#, fuzzy
 msgid "change the language preferences"
-msgstr "Den \"Owner trust\" �ndern"
+msgstr "�ndern der Spracheinstellungen"
 
 #: g10/card-util.c:1296
 msgid "change card holder's sex"
-msgstr ""
+msgstr "�ndern des Geschlechts des Kartenbesitzers"
 
 #: g10/card-util.c:1297
-#, fuzzy
 msgid "change a CA fingerprint"
-msgstr "\"Fingerabdruck\" anzeigen"
+msgstr "�ndern des CA-Fingerabdrucks"
 
 #: g10/card-util.c:1298
 msgid "toggle the signature force PIN flag"
-msgstr ""
+msgstr "Umschalte des \"Signature-force-PIN\"-Schalters"
 
 #: g10/card-util.c:1299
-#, fuzzy
 msgid "generate new keys"
-msgstr "Ein neues Schl�sselpaar erzeugen"
+msgstr "neue Schl�ssel erzeugen"
 
 #: g10/card-util.c:1300
 msgid "menu to change or unblock the PIN"
-msgstr ""
+msgstr "Men� f�r �ndern oder Entsperren der PIN"
 
 #: g10/card-util.c:1366 g10/keyedit.c:1513
 msgid "Command> "
 msgstr "Befehl> "
 
 #: g10/card-util.c:1401
-#, fuzzy
 msgid "Admin-only command\n"
-msgstr "Widerspr�chliche Befehle\n"
+msgstr "nur-Admin Befehl\n"
 
 #: g10/card-util.c:1417
-#, fuzzy
 msgid "Admin commands are allowed\n"
-msgstr "Widerspr�chliche Befehle\n"
+msgstr "Admin-Befehle sind erlaubt\n"
 
 #: g10/card-util.c:1419
-#, fuzzy
 msgid "Admin commands are not allowed\n"
-msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
+msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:1488 g10/keyedit.c:2090
+#: g10/card-util.c:1488 g10/keyedit.c:2091
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
 #: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
+msgstr "Legen Sie die Karte ein und dr�cken Sie 'Eingabe'; dr�cken Sie 'c' um abzubrechen: "
 
 #: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
-msgstr ""
+msgstr "Bitte entfernen Sie die Karte und legen stattdessen die Karte mit folgender Seriennummer ein:\n"
+"   %.*s\n"
 
 #: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
+msgstr "Dr�cken Sie 'Eingabe' wenn fertig; oder dr�cken Sie 'c' um abzubrechen: "
 
 #: g10/cardglue.c:688
-#, fuzzy
 msgid "Enter New Admin PIN: "
-msgstr "Geben Sie die User-ID ein: "
+msgstr "Geben Sie die neue Admin-PIN ein: "
 
 #: g10/cardglue.c:689
-#, fuzzy
 msgid "Enter New PIN: "
-msgstr "Geben Sie die User-ID ein: "
+msgstr "Geben Sie die neue PIN ein: "
 
 #: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
-msgstr ""
+msgstr "Geben Sie die Admin-PIN ein: "
 
 #: g10/cardglue.c:691
-#, fuzzy
 msgid "Enter PIN: "
-msgstr "Geben Sie die User-ID ein: "
+msgstr "Geben Sie die PIN ein: "
 
 #: g10/cardglue.c:705
-#, fuzzy
 msgid "Repeat this PIN: "
-msgstr "Geben Sie die Passphrase nochmal ein: "
+msgstr "Geben Sie die PIN nochmal ein: "
 
 #: g10/cardglue.c:719
-#, fuzzy
 msgid "PIN not correctly repeated; try again"
-msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
+msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
 #: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
@@ -706,11 +671,11 @@ msgstr "'%s' kann nicht ge�ffnet werden\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3153 g10/keyserver.c:1503
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3154 g10/keyserver.c:1503
 #: g10/revoke.c:226
-#, fuzzy, c-format
+#, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
+msgstr "Schl�ssel \"%s\" nicht gefunden: %s\n"
 
 #: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1517
 #: g10/revoke.c:232 g10/revoke.c:439
@@ -723,19 +688,16 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(es sei denn, Sie geben den Schl�ssel mittels Fingerprint an)\n"
 
 #: g10/delkey.c:127
-#, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "Dies kann im Batchmodus ohne \"--yes\" nicht durchgef�hrt werden.\n"
+msgstr "dies kann im Batchmodus ohne \"--yes\" nicht durchgef�hrt werden\n"
 
 #: g10/delkey.c:139
-#, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
-msgstr "Diesen Schl�ssel aus dem Schl�sselbund l�schen? "
+msgstr "Diesen Schl�ssel aus dem Schl�sselbund l�schen? (j/N) "
 
 #: g10/delkey.c:147
-#, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
-msgstr "Dies ist ein privater Schl�ssel! - Wirklich l�schen? "
+msgstr "Dies ist ein privater Schl�ssel! - Wirklich l�schen? (j/N) "
 
 #: g10/delkey.c:157
 #, c-format
@@ -803,20 +765,20 @@ msgstr ""
 "werden.\n"
 
 #: g10/encode.c:540
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
-"Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %s (%d) "
+"WARNUNG: Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %s (%d) "
 "verletzt die Empf�ngervoreinstellungen\n"
 
 #: g10/encode.c:648 g10/sign.c:877
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
-"Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
+"WARNUNG: Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
 "Empf�ngervoreinstellungen.\n"
 
 #: g10/encode.c:735
@@ -873,21 +835,20 @@ msgstr ""
 "nicht sicher sind\n"
 
 #: g10/exec.c:355
-#, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "Diese Plattform ben�tigt tempor�re Dateien zur Ausf�hrung von externen\n"
 "Programmen\n"
 
 #: g10/exec.c:433
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute program `%s': %s\n"
-msgstr "Ausf�hren von %s \"%s\" nicht m�glich: %s\n"
+msgstr "Ausf�hren des Programms `%s' nicht m�glich: %s\n"
 
 #: g10/exec.c:436
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute shell `%s': %s\n"
-msgstr "Ausf�hren von %s \"%s\" nicht m�glich: %s\n"
+msgstr "Ausf�hren der Shell `%s' nicht m�glich: %s\n"
 
 #: g10/exec.c:521
 #, c-format
@@ -919,25 +880,24 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "WARNUNG: Tempor�res Verzeichnis `%s' kann nicht entfernt werden: %s\n"
 
 #: g10/export.c:183
-#, fuzzy
 msgid "exporting secret keys not allowed\n"
-msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
+msgstr "Exportieren geheimer Schl�ssel ist nicht erlaubt\n"
 
 #: g10/export.c:212
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: not protected - skipped\n"
-msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
+msgstr "Schl�ssel %s: ungesch�tzt - �bersprungen\n"
 
 #: g10/export.c:220
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "Schl�ssel %08lX: PGP 2.x-artiger Schl�ssel - �bersprungen\n"
+msgstr "Schl�ssel %s: PGP 2.x-artiger Schl�ssel - �bersprungen\n"
 
 # translated by wk
 #: g10/export.c:395
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-msgstr "WARNUNG: Der geheime Schl�ssel %08lX hat keine einfache SK Pr�fsumme\n"
+msgstr "WARNUNG: Der geheime Schl�ssel %s hat keine einfache SK-Pr�fsumme\n"
 
 #: g10/export.c:427
 msgid "WARNING: nothing exported\n"
@@ -988,9 +948,8 @@ msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
 #: g10/g10.c:376
-#, fuzzy
 msgid "list and check key signatures"
-msgstr "Signaturen der Schl�ssel pr�fen"
+msgstr "Signaturen der Schl�ssel auflisten und pr�fen"
 
 #: g10/g10.c:377
 msgid "list keys and fingerprints"
@@ -1054,15 +1013,15 @@ msgstr "Schl�ssel importieren/kombinieren"
 
 #: g10/g10.c:400
 msgid "print the card status"
-msgstr ""
+msgstr "den Karten-Status ausgeben"
 
 #: g10/g10.c:401
 msgid "change data on a card"
-msgstr ""
+msgstr "Daten auf einer Karte �ndern"
 
 #: g10/g10.c:402
 msgid "change a card's PIN"
-msgstr ""
+msgstr "PIN einer Karte �ndern"
 
 #: g10/g10.c:410
 msgid "update the trust database"
@@ -1120,11 +1079,11 @@ msgstr "vor �berschreiben nachfragen"
 
 #: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
-msgstr ""
+msgstr "OpenPGP-Verhalten strikt beachten"
 
 #: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
-msgstr ""
+msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
 
 #: g10/g10.c:536
 msgid ""
@@ -1187,7 +1146,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "�ff.Schl�ssel: "
 
-#: g10/g10.c:760 g10/keyedit.c:2127
+#: g10/g10.c:760 g10/keyedit.c:2128
 msgid "Cipher: "
 msgstr "Verschl�.: "
 
@@ -1195,7 +1154,7 @@ msgstr "Verschl�.: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:772 g10/keyedit.c:2173
+#: g10/g10.c:772 g10/keyedit.c:2174
 msgid "Compression: "
 msgstr "Komprimierung: "
 
@@ -1208,82 +1167,80 @@ msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
 #: g10/g10.c:1021
-#, fuzzy, c-format
+#, c-format
 msgid "no = sign found in group definition `%s'\n"
-msgstr "Kein '='-Zeichen in der Gruppendefinition \"%s\"\n"
+msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
 #: g10/g10.c:1218
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
-msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home-Verzeichnis \"%s\"\n"
+msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home-Verzeichnis `%s'\n"
 
 #: g10/g10.c:1221
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
-msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfigurationsdatei \"%s\"\n"
+msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfigurationsdatei `%s'\n"
 
 #: g10/g10.c:1224
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
-msgstr "WARNUNG: Unsicheres Besitzverh�ltnis (%s) \"%s\"\n"
+msgstr "WARNUNG: Unsicheres Besitzverh�ltnis auf die Erweiterung `%s'\n"
 
 #: g10/g10.c:1230
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
-msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis \"%s\"\n"
+msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
 #: g10/g10.c:1233
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
-msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei \"%s\"\n"
+msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
 #: g10/g10.c:1236
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
-msgstr "WARNUNG: Unsichere Zugriffsrechte (%s) \"%s\"\n"
+msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
 #: g10/g10.c:1242
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
-"WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses f�r Home-Verzeichnis "
-"\"%s\"\n"
+"WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses f�r Home-Verzeichnis `%s'\n"
 
 #: g10/g10.c:1245
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
-"WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses der "
-"Konfigurationsdatei \"%s\"\n"
+"WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses der "
+"Konfigurationsdatei `%s'\n"
 
 #: g10/g10.c:1248
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
-msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses (%s) \"%s\"\n"
+msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses `%s'\n"
 
 #: g10/g10.c:1254
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
-"WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses des Home-"
-"Verzeichnisses  \"%s\"\n"
+"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
+"Verzeichnisses `%s'\n"
 
 #: g10/g10.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
-"WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses der Konfigurationsdatei "
-"\"%s\"\n"
+"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der Konfigurationsdatei `%s'\n"
 
 #: g10/g10.c:1260
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
-msgstr "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses (%s) \"%s\"\n"
+msgstr "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf Erweiterung `%s'\n"
 
 #: g10/g10.c:1401
-#, fuzzy, c-format
+#, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
@@ -1313,69 +1270,65 @@ msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
 #: g10/g10.c:2076
-#, fuzzy, c-format
+#, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
-"Verschl�sselungserweiterung \"%s\" wurde wegen falscher Rechte nicht "
+"Verschl�sselungserweiterung `%s' wurde wegen unsicherer Zugriffsrechte nicht "
 "geladen\n"
 
 #: g10/g10.c:2293
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a valid character set\n"
-msgstr "%s ist kein g�ltiger Zeichensatz.\n"
+msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3669
-#, fuzzy
+#: g10/g10.c:2312 g10/keyedit.c:3670
 msgid "could not parse keyserver URL\n"
-msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
+msgstr "Schl�sselserver-URL konnte nicht analysiert werden\n"
 
 #: g10/g10.c:2318
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: ung�ltige Export Option.\n"
+msgstr "%s:%d: ung�ltige Schl�sselserver-Option\n"
 
 #: g10/g10.c:2321
-#, fuzzy
 msgid "invalid keyserver options\n"
-msgstr "Ung�ltige export Option\n"
+msgstr "Ung�ltige Schl�sselserver-Option\n"
 
 #: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: ung�ltige Import Option.\n"
+msgstr "%s:%d: ung�ltige Import-Option\n"
 
 #: g10/g10.c:2331
 msgid "invalid import options\n"
-msgstr "Ung�ltige Import Option\n"
+msgstr "Ung�ltige Import-Option\n"
 
 #: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d: ung�ltige Export Option.\n"
+msgstr "%s:%d: ung�ltige Export-Option.\n"
 
 #: g10/g10.c:2341
 msgid "invalid export options\n"
-msgstr "Ung�ltige export Option\n"
+msgstr "Ung�ltige Export-Option\n"
 
 #: g10/g10.c:2348
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: ung�ltige Import Option.\n"
+msgstr "%s:%d: ung�ltige Listen-Option.\n"
 
 #: g10/g10.c:2351
-#, fuzzy
 msgid "invalid list options\n"
-msgstr "Ung�ltige Import Option\n"
+msgstr "Ung�ltige Listen-Option\n"
 
 #: g10/g10.c:2373
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: ung�ltige Export Option.\n"
+msgstr "%s:%d: ung�ltige �berpr�funs-Option.\n"
 
 #: g10/g10.c:2376
-#, fuzzy
 msgid "invalid verify options\n"
-msgstr "Ung�ltige export Option\n"
+msgstr "Ung�ltige �berpr�fungs-Option\n"
 
 #: g10/g10.c:2383
 #, c-format
@@ -1542,13 +1495,12 @@ msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
 #: g10/g10.c:3024
-#, fuzzy
 msgid "--symmetric --encrypt [filename]"
-msgstr "--sign --encrypt [Dateiname]"
+msgstr "--symmetric --encrypt [Dateiname]"
 
 #: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
 #: g10/g10.c:3029
 #, fuzzy, c-format
@@ -1570,7 +1522,7 @@ msgstr "--sign --encrypt [Dateiname]"
 
 #: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
 #: g10/g10.c:3080
 #, fuzzy, c-format
@@ -2091,7 +2043,7 @@ msgid "skipping block of type %d\n"
 msgstr "�berspringe den Block vom Typ %d\n"
 
 #: g10/import.c:256
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
 
@@ -2814,8 +2766,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4118 g10/keyedit.c:4209 g10/keyedit.c:4273
-#: g10/keyedit.c:4334 g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4119 g10/keyedit.c:4210 g10/keyedit.c:4274
+#: g10/keyedit.c:4335 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -3066,233 +3018,233 @@ msgstr ""
 msgid "Key is revoked."
 msgstr "Schl�ssel wurde widerrufen."
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1647
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1654
+#: g10/keyedit.c:1655
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Unbekannte Unterschriftenklasse"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/keyedit.c:1699 g10/keyedit.c:1719 g10/keyedit.c:1885
+#: g10/keyedit.c:1700 g10/keyedit.c:1720 g10/keyedit.c:1886
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1702
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1704
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1705
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1766
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1809
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Fehler beim Erzeugen des Schl�sselbundes `%s': %s\n"
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1850
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1853
+#: g10/keyedit.c:1854
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1888
+#: g10/keyedit.c:1889
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1890
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Diese User-ID wirklich widerrufen? "
 
-#: g10/keyedit.c:1907
+#: g10/keyedit.c:1908
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1918
+#: g10/keyedit.c:1919
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1921
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1961
+#: g10/keyedit.c:1962
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1993
+#: g10/keyedit.c:1994
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich �ndern? "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:2054
+#: g10/keyedit.c:2055
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:2064
+#: g10/keyedit.c:2065
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2071
+#: g10/keyedit.c:2072
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2079
 msgid "Key not changed so no update needed.\n"
 msgstr "Schl�ssel ist nicht ge�ndert worden, also ist kein Speichern n�tig.\n"
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2151
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2203
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:2213
+#: g10/keyedit.c:2214
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2228 g10/keylist.c:307
+#: g10/keyedit.c:2229 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2459
+#: g10/keyedit.c:2460
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
 
-#: g10/keyedit.c:2480
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
 
-#: g10/keyedit.c:2486
+#: g10/keyedit.c:2487
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2502 g10/keyedit.c:2558 g10/keyedit.c:2670 g10/keyedit.c:2685
+#: g10/keyedit.c:2503 g10/keyedit.c:2559 g10/keyedit.c:2671 g10/keyedit.c:2686
 #: g10/keylist.c:193 g10/keyserver.c:414
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/keyedit.c:2505 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2506 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2507 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2508 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2509 g10/keyedit.c:2560 g10/keyedit.c:2672 g10/keyedit.c:2687
+#: g10/keyedit.c:2510 g10/keyedit.c:2561 g10/keyedit.c:2673 g10/keyedit.c:2688
 #: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
 #: g10/keylist.c:913 g10/keyserver.c:420 g10/mainproc.c:937
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2511
+#: g10/keyedit.c:2512
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2526
+#: g10/keyedit.c:2527
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2530
+#: g10/keyedit.c:2531
 #, c-format
 msgid "validity: %s"
 msgstr "G�ltigkeit: %s"
 
-#: g10/keyedit.c:2537
+#: g10/keyedit.c:2538
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:2565 g10/keylist.c:199
+#: g10/keyedit.c:2566 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2632
+#: g10/keyedit.c:2633
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schl�ssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2641
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3300,20 +3252,20 @@ msgstr ""
 "Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
 "Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2704 g10/keyserver.c:424 g10/mainproc.c:1577
+#: g10/keyedit.c:2705 g10/keyserver.c:424 g10/mainproc.c:1577
 #: g10/trustdb.c:1178
 #, fuzzy
 msgid "revoked"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2706 g10/keyserver.c:428 g10/mainproc.c:1579
+#: g10/keyedit.c:2707 g10/keyserver.c:428 g10/mainproc.c:1579
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
 # translated by wk
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2772
 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"
@@ -3321,7 +3273,7 @@ msgstr ""
 "WARNUNG: Keine User-ID ist als prim�r markiert.  Dieses Kommando kann\n"
 "dazu f�hren, da� eine andere User-ID as prim�r angesehen wird.\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2832
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3331,45 +3283,45 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2836 g10/keyedit.c:3114
+#: g10/keyedit.c:2837 g10/keyedit.c:3115
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch hinzuf�gen? (j/N) "
 
-#: g10/keyedit.c:2842
+#: g10/keyedit.c:2843
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Sie k�nnen einem PGP2-artigen Schl���sel keine Foto-ID hinzuf�gen.\n"
 
-#: g10/keyedit.c:2982
+#: g10/keyedit.c:2983
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2993
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:2997
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3002
+#: g10/keyedit.c:3003
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3017
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3017
+#: g10/keyedit.c:3018
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3021
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3110
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3379,37 +3331,37 @@ msgstr ""
 "         Widerrufers k�nnte bei einigen PGP-Versionen zur Zur�ckweisung\n"
 "         des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:3120
+#: g10/keyedit.c:3121
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie k�nnen einem PGP2-artigen Schl���sel keine vorgesehenen Widerrufer "
 "hinzuf�gen.\n"
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3141
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3164
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schl�ssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3179
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schl�ssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "this key has already been designated as a revoker\n"
 msgstr "Dieser Schl�ssel wurde bereits als ein Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:3219
+#: g10/keyedit.c:3220
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WARNUNG: Einen Schl�ssel als vorgesehenen Widerrufer zu deklarieren, kann "
 "nicht r�ckgangig gemacht werden!\n"
 
-#: g10/keyedit.c:3225
+#: g10/keyedit.c:3226
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3417,141 +3369,141 @@ msgstr ""
 "M�chten Sie diesen Schl�ssel wirklich als vorgesehenen Widerrufer "
 "deklarieren? (j/N): "
 
-#: g10/keyedit.c:3286
+#: g10/keyedit.c:3287
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:3292
+#: g10/keyedit.c:3293
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:3296
+#: g10/keyedit.c:3297
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:3299
+#: g10/keyedit.c:3300
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3346
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3362
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:3441
+#: g10/keyedit.c:3442
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:3480 g10/keyedit.c:3590 g10/keyedit.c:3710
+#: g10/keyedit.c:3481 g10/keyedit.c:3591 g10/keyedit.c:3711
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�berspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:3651
+#: g10/keyedit.c:3652
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3731
+#: g10/keyedit.c:3732
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:3732
+#: g10/keyedit.c:3733
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3795
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:3960 g10/keyedit.c:4024 g10/keyedit.c:4067
+#: g10/keyedit.c:3961 g10/keyedit.c:4025 g10/keyedit.c:4068
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   beglaubigt durch %08lX um %s%s%s\n"
 
-#: g10/keyedit.c:3962 g10/keyedit.c:4026 g10/keyedit.c:4069
+#: g10/keyedit.c:3963 g10/keyedit.c:4027 g10/keyedit.c:4070
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3966
+#: g10/keyedit.c:3967
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:3970
+#: g10/keyedit.c:3971
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:3974
+#: g10/keyedit.c:3975
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:4001
+#: g10/keyedit.c:4002
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:4027
+#: g10/keyedit.c:4028
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4034
+#: g10/keyedit.c:4035
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:4056
+#: g10/keyedit.c:4057
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:4076
+#: g10/keyedit.c:4077
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:4106
+#: g10/keyedit.c:4107
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
-#: g10/keyedit.c:4176
+#: g10/keyedit.c:4177
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4193
+#: g10/keyedit.c:4194
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n"
 
-#: g10/keyedit.c:4257
+#: g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4319
+#: g10/keyedit.c:4320
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4415
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3765,24 +3717,22 @@ msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
 #: g10/keygen.c:1575
-#, fuzzy
 msgid "Key does not expire at all\n"
-msgstr "%s verf�llt nie.\n"
+msgstr "Schl�ssel verf�llt nie\n"
 
 #: g10/keygen.c:1576
-#, fuzzy
 msgid "Signature does not expire at all\n"
-msgstr "%s verf�llt nie.\n"
+msgstr "Signature verf�llt nie\n"
 
 #: g10/keygen.c:1583
-#, fuzzy, c-format
+#, c-format
 msgid "Key expires at %s\n"
-msgstr "%s verf�llt am %s\n"
+msgstr "Key verf�llt am %s\n"
 
 #: g10/keygen.c:1584
-#, fuzzy, c-format
+#, c-format
 msgid "Signature expires at %s\n"
-msgstr "Diese Unterschrift verf�llt am %s.\n"
+msgstr "Unterschrift verf�llt am %s\n"
 
 #: g10/keygen.c:1590
 msgid ""
@@ -3793,9 +3743,8 @@ msgstr ""
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
 #: g10/keygen.c:1595
-#, fuzzy
 msgid "Is this correct? (y/N) "
-msgstr "Ist dies richtig? (j/n) "
+msgstr "Ist dies richtig? (j/N) "
 
 #: g10/keygen.c:1638
 #, fuzzy
@@ -4031,16 +3980,16 @@ msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
 #: g10/keygen.c:3492
 #, c-format
 msgid "length of RSA modulus is not %d\n"
-msgstr ""
+msgstr "die L�nge des RSA-Modulus betr�gt nicht %d\n"
 
 #: g10/keygen.c:3498
 msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
+msgstr "der �ffentliche Exponent ist zu gro� (mehr als 32 Bit)\n"
 
 #: g10/keygen.c:3504 g10/keygen.c:3510
 #, c-format
 msgid "length of an RSA prime is not %d\n"
-msgstr ""
+msgstr "die L�nge einer RSA-Primzahl ist nicht %d\n"
 
 #: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
 msgid "never     "
@@ -4079,9 +4028,9 @@ msgid "Keyring"
 msgstr "Schl�sselbund"
 
 #: g10/keylist.c:792
-#, fuzzy, c-format
+#, c-format
 msgid "expired: %s)"
-msgstr " [verf�llt: %s]"
+msgstr "verf�llt: %s)"
 
 #: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
@@ -4102,13 +4051,12 @@ msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
 #: g10/keylist.c:1503 g10/keylist.c:1507
-#, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Schl.-Fingerabdruck ="
 
 #: g10/keylist.c:1574
 msgid "      Card serial no. ="
-msgstr ""
+msgstr "      Kartenseriennr. ="
 
 #: g10/keyring.c:1245
 #, fuzzy, c-format
@@ -4563,9 +4511,8 @@ msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
 #: g10/misc.c:722
-#, fuzzy
 msgid "uncompressed|none"
-msgstr "nicht komprimiert"
+msgstr "unkomprimiert|kein|keine"
 
 #: g10/misc.c:832
 #, c-format
@@ -4588,7 +4535,6 @@ msgid "File `%s' exists. "
 msgstr "Datei '%s' existiert bereits. "
 
 #: g10/openfile.c:86
-#, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "�berschreiben (j/N)? "
 
@@ -4622,9 +4568,9 @@ msgstr ""
 "WARNUNG: Optionen in `%s' sind w�hrend dieses Laufes noch nicht wirksam\n"
 
 #: g10/openfile.c:409
-#, fuzzy, c-format
+#, c-format
 msgid "directory `%s' created\n"
-msgstr "%s: Verzeichnis erzeugt\n"
+msgstr "Verzeichnis `%s' erzeugt\n"
 
 #: g10/parse-packet.c:137
 #, c-format
@@ -6084,9 +6030,8 @@ msgid "canceled"
 msgstr "Abbruch"
 
 #: util/errors.c:109
-#, fuzzy
 msgid "no card"
-msgstr "nicht verschl�sselt"
+msgstr "keine Karte"
 
 #: util/logger.c:157
 msgid "ERROR: "
@@ -6140,12 +6085,11 @@ msgstr ""
 
 #: util/miscutil.c:387
 msgid "oO"
-msgstr ""
+msgstr "oO"
 
 #: util/miscutil.c:388
-#, fuzzy
 msgid "cC"
-msgstr "c"
+msgstr "cC"
 
 #: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index cd957e1e8..b8c7433c7 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -13,7 +13,7 @@
 	* w32installer.nsi: Display README.W32 at the end of the
 	installation.
 	* mk-w32-dist: Append .txt to README.W32.
-	
+
 2005-01-26  Werner Koch  <[email protected]>
 
 	* w32installer.nsi: Create a start menu entry and enhanced the
@@ -428,7 +428,8 @@ Wed Oct 14 09:55:25 1998  Werner Koch  ([email protected])
 	* config.sub: (freebsd): Add to maybe_os
 
 
- Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+	   2005  Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without