* skclist.c (build_sk_list): Don't need to warn about PGP-generated

Elgamal signing keys since we no longer support any Elgamal signing keys.

* sign.c (sign_file, clearsign_file): Use "writing to" instead of "writing
to file" to match other strings.

* pkclist.c (check_signatures_trust): Fix typo.  Noted by Moray Allan.
This is Debian bug #278708.

* passphrase.c (ask_passphrase, passphrase_to_dek): "password" ->
"passphrase".

* keyedit.c (show_key_with_all_names): Show designated revoker as part of
translatable string.

1 files changed, 5 insertions, 4 deletions

diff --git a/g10/passphrase.c b/g10/passphrase.c
index 3f6c7d3b9..c7102586d 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -1050,7 +1050,7 @@ ask_passphrase (const char *description,
     }
   else if (opt.batch)
     {
-      log_error(_("can't query password in batch mode\n"));
+      log_error(_("can't query passphrase in batch mode\n"));
       pw = NULL;
     }
   else {
@@ -1207,10 +1207,11 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo,
 	pw = m_alloc_secure( strlen(fd_passwd)+1 );
 	strcpy( pw, fd_passwd );
     }
-    else if( opt.batch ) {
-	log_error(_("can't query password in batch mode\n"));
+    else if( opt.batch )
+      {
+	log_error(_("can't query passphrase in batch mode\n"));
 	pw = m_strdup( "" ); /* return an empty passphrase */
-    }
+      }
     else {
         /* Read the passphrase from the tty or the command-fd. */
 	pw = cpr_get_hidden("passphrase.enter", _("Enter passphrase: ") );