L10N document PGP/SMIME options

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index c3cea0bb2c4ee5d12d0978d8bfb61fcd142fa137..1c543a58d16a00f4d020b623af5eb2cde86e2842 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -4713,7 +4713,7 @@ static int gpgme_send_menu (HEADER *msg, int *redraw, int is_smime)
       /* L10N: S/MIME options (opportunistic encryption is on) */
       prompt = _("S/MIME (s)ign, sign (a)s, (p)gp, (c)lear, or (o)ppenc mode off? ");
       /* L10N: S/MIME options (opportunistic encryption is on)
-         The 'f' is undocumented. Please duplicate the letter 'c' is translated into. */
+         The 'f' is undocumented. Please DO NOT translate it. */
       letters = _("sapfco");
       choices = "SapFCo";
     }
@@ -4722,7 +4722,7 @@ static int gpgme_send_menu (HEADER *msg, int *redraw, int is_smime)
       /* L10N: PGP options (opportunistic encryption is on) */
       prompt = _("PGP (s)ign, sign (a)s, s/(m)ime, (c)lear, or (o)ppenc mode off? ");
       /* L10N: PGP options (opportunistic encryption is on)
-         The 'f' is undocumented. Please duplicate the letter 'c' is translated into. */
+         The 'f' is undocumented. Please DO NOT translate it. */
       letters = _("samfco");
       choices = "SamFCo";
     }
@@ -4738,7 +4738,7 @@ static int gpgme_send_menu (HEADER *msg, int *redraw, int is_smime)
       /* L10N: S/MIME options (opportunistic encryption is off) */
       prompt = _("S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp, (c)lear, or (o)ppenc mode? ");
       /* L10N: S/MIME options (opportunistic encryption is off)
-         The 'f' is undocumented. Please duplicate the letter 'c' is translated into. */
+         The 'f' is undocumented. Please DO NOT translate it. */
       letters = _("esabpfco");
       choices = "esabpfcO";
     }
@@ -4747,7 +4747,7 @@ static int gpgme_send_menu (HEADER *msg, int *redraw, int is_smime)
       /* L10N: PGP options (opportunistic encryption is off) */
       prompt = _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime, (c)lear, or (o)ppenc mode? ");
       /* L10N: PGP options (opportunistic encryption is off)
-         The 'f' is undocumented. Please duplicate the letter 'c' is translated into. */
+         The 'f' is undocumented. Please DO NOT translate it. */
       letters = _("esabmfco");
       choices = "esabmfcO";
     }
@@ -4762,7 +4762,7 @@ static int gpgme_send_menu (HEADER *msg, int *redraw, int is_smime)
       /* L10N: S/MIME options */
       prompt = _("S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear? ");
       /* L10N: S/MIME options
-         The 'f' is undocumented. Please duplicate the letter 'c' is translated into. */
+         The 'f' is undocumented. Please DO NOT translate it. */
       letters = _("esabpfc");
       choices = "esabpfc";
     }
@@ -4771,7 +4771,7 @@ static int gpgme_send_menu (HEADER *msg, int *redraw, int is_smime)
       /* L10N: PGP options */
       prompt = _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear? ");
       /* L10N: PGP options
-         The 'f' is undocumented. Please duplicate the letter 'c' is translated into. */
+         The 'f' is undocumented. Please DO NOT translate it. */
       letters = _("esabmfc");
       choices = "esabmfc";
     }

diff --git a/pgp.c b/pgp.c
index 6a5dea20cd41fe737c7adf407bcbb4f140446475..9727edd89c19834362114d1bb6a4723ca6df93c4 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -1716,6 +1716,19 @@ int pgp_send_menu (HEADER *msg, int *redraw)
 
   msg->security |= APPLICATION_PGP;
 
+  char *mime_inline;
+  if (msg->security & INLINE)
+  {
+    /* L10N: These next string MUST have the same highlighed letter
+             One of them will appear in each of the three strings marked "(inline"), below. */
+    mime_inline = _("PGP/M(i)ME");
+  }
+  else
+  {
+    /* L10N: These previous string MUST have the same highlighed letter
+             One of them will appear in each of the three strings marked "(inline"), below. */
+    mime_inline = _("(i)nline");
+  }
   /*
    * Opportunistic encrypt is controlling encryption.  Allow to toggle
    * between inline and mime, but not turn encryption on or off.
@@ -1727,19 +1740,21 @@ int pgp_send_menu (HEADER *msg, int *redraw)
     if (msg->security & (ENCRYPT | SIGN))
     {
       snprintf (promptbuf, sizeof (promptbuf),
-          _("PGP (s)ign, sign (a)s, %s format, (c)lear, or (o)ppenc mode off? "),
-          (msg->security & INLINE) ? _("PGP/M(i)ME") : _("(i)nline"));
+          /* L10N: PGP options (inline) (opportunistic encryption is on) */
+          _("PGP (s)ign, sign (a)s, %s format, (c)lear, or (o)ppenc mode off? "), mime_inline);
       prompt = promptbuf;
-      /* L10N: The 'f' is from "forget it", an old undocumented synonym of
-         'clear'.  Please use a corresponding letter in your language.
-         Alternatively, you may duplicate the letter 'c' is translated to.
-         This comment also applies to the five following letter sequences. */
+      /* L10N: PGP options (inline) (opportunistic encryption is on)
+         The 'i' is from the "PGP/M(i)ME" or "(i)nline", above.
+         The 'f' is undocumented. Please DO NOT translate it. */
       letters = _("safcoi");
       choices = "SaFCoi";
     }
     else
     {
+      /* L10N: PGP options (opportunistic encryption is on) */
       prompt = _("PGP (s)ign, sign (a)s, (c)lear, or (o)ppenc mode off? ");
+      /* L10N: PGP options (opportunistic encryption is on)
+         The 'f' is undocumented. Please DO NOT translate it. */
       letters = _("safco");
       choices = "SaFCo";
     }
@@ -1757,15 +1772,21 @@ int pgp_send_menu (HEADER *msg, int *redraw)
     {
 
       snprintf (promptbuf, sizeof (promptbuf), 
-          _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, (c)lear, or (o)ppenc mode? "),
-          (msg->security & INLINE) ? _("PGP/M(i)ME") : _("(i)nline"));
+          /* L10N: PGP options (inline) (opportunistic encryption is off) */
+          _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, (c)lear, or (o)ppenc mode? "), mime_inline);
       prompt = promptbuf;
+      /* L10N: PGP options (inline) (opportunistic encryption is off)
+         The 'i' is from the "PGP/M(i)ME" or "(i)nline", above.
+         The 'f' is undocumented. Please DO NOT translate it. */
       letters = _("esabfcoi");
       choices = "esabfcOi";
     }
     else
     {
+      /* L10N: PGP options (opportunistic encryption is off) */
       prompt = _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (c)lear, or (o)ppenc mode? ");
+      /* L10N: PGP options (opportunistic encryption is off)
+         The 'f' is undocumented. Please DO NOT translate it. */
       letters = _("esabfco");
       choices = "esabfcO";
     }
@@ -1779,15 +1800,21 @@ int pgp_send_menu (HEADER *msg, int *redraw)
     {
 
       snprintf (promptbuf, sizeof (promptbuf), 
-          _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, or (c)lear? "),
-          (msg->security & INLINE) ? _("PGP/M(i)ME") : _("(i)nline"));
+          /* L10N: PGP options (inline) */
+          _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, or (c)lear? "), mime_inline);
       prompt = promptbuf;
+      /* L10N: PGP options (inline)
+         The 'i' is from the "PGP/M(i)ME" or "(i)nline", above.
+         The 'f' is undocumented. Please DO NOT translate it. */
       letters = _("esabfci");
       choices = "esabfci";
     }
     else
     {
+      /* L10N: PGP options */
       prompt = _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (c)lear? ");
+      /* L10N: PGP options
+         The 'f' is undocumented. Please DO NOT translate it. */
       letters = _("esabfc");
       choices = "esabfc";
     }

diff --git a/smime.c b/smime.c
index 2fcb82c846f788d96b5bcd308ceaf2305b050b80..f1dd07751f42c3d3ebcdece6ab789c506495c158 100644 (file)
--- a/smime.c
+++ b/smime.c
@@ -2107,11 +2107,10 @@ int smime_send_menu (HEADER *msg, int *redraw)
    */
   if (option (OPTCRYPTOPPORTUNISTICENCRYPT) && (msg->security & OPPENCRYPT))
   {
+    /* L10N: S/MIME options (opportunistic encryption is on) */
     prompt = _("S/MIME (s)ign, encrypt (w)ith, sign (a)s, (c)lear, or (o)ppenc mode off? ");
-    /* L10N: The 'f' is from "forget it", an old undocumented synonym of
-       'clear'.  Please use a corresponding letter in your language.
-       Alternatively, you may duplicate the letter 'c' is translated to.
-       This comment also applies to the two following letter sequences. */
+    /* L10N: S/MIME options (opportunistic encryption is on)
+        The 'f' is undocumented. Please DO NOT translate it. */
     letters = _("swafco");
     choices = "SwaFCo";
   }
@@ -2121,7 +2120,10 @@ int smime_send_menu (HEADER *msg, int *redraw)
    */
   else if (option (OPTCRYPTOPPORTUNISTICENCRYPT))
   {
+    /* L10N: S/MIME options (opportunistic encryption is off) */
     prompt = _("S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, (c)lear, or (o)ppenc mode? ");
+    /* L10N: S/MIME options (opportunistic encryption is off)
+        The 'f' is undocumented. Please DO NOT translate it. */
     letters = _("eswabfco");
     choices = "eswabfcO";
   }
@@ -2130,7 +2132,10 @@ int smime_send_menu (HEADER *msg, int *redraw)
    */
   else
   {
+    /* L10N: S/MIME options */
     prompt = _("S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? ");
+    /* L10N: S/MIME options
+        The 'f' is undocumented. Please DO NOT translate it. */
     letters = _("eswabfc");
     choices = "eswabfc";
   }