From 5251a17c26fadd6559295f6962f831a97eeeefdb Mon Sep 17 00:00:00 2001 From: pdmef Date: Wed, 27 Jul 2005 16:19:09 +0000 Subject: [PATCH] Rocco Rutte: - merge in latest mutt changes git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@359 e385b8ad-14ed-0310-8656-cc95a2468c6d --- ChangeLog.mutt | 4 ++++ crypt-gpgme.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog.mutt b/ChangeLog.mutt index ef4aed1..c0c2ee7 100644 --- a/ChangeLog.mutt +++ b/ChangeLog.mutt @@ -1,3 +1,7 @@ +2005-07-27 15:08:43 Vincent Lefevre (brendan) + + * crypt-gpgme.c: Correct two typos in GPGME error messages. + 2005-07-27 05:53:27 Brendan Cully (brendan) * po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, po/es.po, diff --git a/crypt-gpgme.c b/crypt-gpgme.c index bfcd5de..03eb846 100644 --- a/crypt-gpgme.c +++ b/crypt-gpgme.c @@ -600,7 +600,7 @@ static int set_signer (gpgme_ctx_t ctx, int for_smime) gpgme_key_release (key); gpgme_key_release (key2); gpgme_release (listctx); - mutt_error (_("ambiguous specfication of secret key `%s'\n"), signid); + mutt_error (_("ambiguous specification of secret key `%s'\n"), signid); return -1; } gpgme_op_keylist_end (listctx); @@ -988,7 +988,7 @@ static int show_sig_summary (unsigned long sum, gpgme_signature_t sig; unsigned int i; - state_attach_puts (_("A system error occured"), s); + state_attach_puts (_("A system error occurred"), s); /* Try to figure out some more detailed system error information. */ result = gpgme_op_verify_result (ctx); -- 2.20.1