Index: camel-gpg-context.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-gpg-context.c,v
retrieving revision 1.66
diff -u -3 -p -r1.66 camel-gpg-context.c
--- camel-gpg-context.c	2 Dec 2004 08:03:30 -0000	1.66
+++ camel-gpg-context.c	24 Jan 2005 17:59:51 -0000
@@ -1128,22 +1128,22 @@ gpg_ctx_op_step (struct _GpgCtx *gpg, Ca
 	
 	switch (gpg->mode) {
 	case GPG_CTX_MODE_SIGN:
-		mode = "sign";
+		mode = _("Failed to GPG sign");
 		break;
 	case GPG_CTX_MODE_VERIFY:
-		mode = "verify";
+		mode = _("Failed to GPG verify");
 		break;
 	case GPG_CTX_MODE_ENCRYPT:
-		mode = "encrypt";
+		mode = _("Failed to GPG encrypt");
 		break;
 	case GPG_CTX_MODE_DECRYPT:
-		mode = "decrypt";
+		mode = _("Failed to GPG decrypt");
 		break;
 	case GPG_CTX_MODE_IMPORT:
-		mode = "import keys";
+		mode = _("Failed to GPG import keys");
 		break;
 	case GPG_CTX_MODE_EXPORT:
-		mode = "export keys";
+		mode = _("Failed to GPG export keys");
 		break;
 	default:
 		g_assert_not_reached ();
@@ -1154,12 +1154,12 @@ gpg_ctx_op_step (struct _GpgCtx *gpg, Ca
 	diagnostics = gpg_ctx_get_diagnostics (gpg);
 	if (diagnostics && *diagnostics) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Failed to GPG %s: %s\n\n%s"),
+				      "%s: %s\n\n%s",
 				      mode, g_strerror (errno),
 				      diagnostics);
 	} else {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Failed to GPG %s: %s\n"),
+				      "%s: %s\n",
 				      mode, g_strerror (errno));
 	}
 	
