[Evolution-hackers] Re: [evolution-patches] patch for #36142: Don't use acronyms as verbs in messages (camel-gpg-context.c)

[Jorge Bernal <koke amedias org>]

El Martes 25 Enero 2005 01:28, Not Zed escribió:
> I would suggest using some better grammar since it isn't limited by the
> string formatting anymore.
>

What about this another?

I put copy on evo-hackers since I've read strings discussions are made there.

> Then again this is a system/execution error, i'm not sure it even needs
> this detail.  e.g. it only happens if gpg crashes and burns/the system
> runs out of resources, etc.  So it probably rarely happens.
>
> "Error executing gpg: %s" might suffice.
>
> On Mon, 2005-01-24 at 19:07 +0100, Jorge Bernal wrote:
> >         switch (gpg->mode) {
> >         case GPG_CTX_MODE_SIGN:
> > -               mode = "sign";
> > +               mode = _("Failed to GPG sign");
> >                 break;

-- 
Jorge Bernal "Koke"
Personal:  koke sindominio net
Jabber:  koke zgzjabber ath cx
Blog:  http://www.amedias.org/koke/

"Computer Science is no more about computers than astronomy is about 
telescopes." - Edsger Dijkstra

? camel-mime-tables.c
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	25 Jan 2005 01:08:10 -0000
@@ -1128,22 +1128,22 @@ gpg_ctx_op_step (struct _GpgCtx *gpg, Ca
 	
 	switch (gpg->mode) {
 	case GPG_CTX_MODE_SIGN:
-		mode = "sign";
+		mode = _("GPG error when signing");
 		break;
 	case GPG_CTX_MODE_VERIFY:
-		mode = "verify";
+		mode = _("GPG error when verifying");
 		break;
 	case GPG_CTX_MODE_ENCRYPT:
-		mode = "encrypt";
+		mode = _("GPG error when encrypting");
 		break;
 	case GPG_CTX_MODE_DECRYPT:
-		mode = "decrypt";
+		mode = _("GPG error when decrypting");
 		break;
 	case GPG_CTX_MODE_IMPORT:
-		mode = "import keys";
+		mode = _("GPG error when importing keys");
 		break;
 	case GPG_CTX_MODE_EXPORT:
-		mode = "export keys";
+		mode = _("GPG error when exporting 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));
 	}