--- PATCHES Dec 2002 17:44:54 -0000	3.6
+++ PATCHES Apr 2003 04:55:01 -0000
@@ -0,0 +1 @@
+patch-1.5.4.dw.pgp-menu-traditional.2
--- compose.c Mar 2003 14:01:06 -0000	3.10
+++ compose.c Apr 2003 04:55:01 -0000
@@ -133,2 +133,9 @@ static void redraw_crypt_lines (HEADER *
     addstr (_("Clear"));
+
+  if ((WithCrypto & APPLICATION_PGP))
+    if ((msg->security & (ENCRYPT | SIGN)))
+      if ((msg->security & INLINE))
+	addstr (_(" (inline)"));
+      else
+	addstr (_(" (PGP/MIME)"));
   clrtoeol ();
@@ -158,2 +165,3 @@ static int pgp_send_menu (HEADER *msg, i
 {
+  int use_autoinline = 0;
   pgp_key_t p;
@@ -164,7 +172,10 @@ static int pgp_send_menu (HEADER *msg, i
 
-  switch (mutt_multi_choice (_("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
-			     N_("esabf")))
+  if (! (msg->security & (SIGN | ENCRYPT)))
+    use_autoinline = 1;
+
+  switch (mutt_multi_choice (_("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "),
+			     N_("esabif")))
   {
   case 1: /* (e)ncrypt */
-    msg->security |= PGPENCRYPT;
+    msg->security ^= ENCRYPT;
     break;
@@ -172,3 +183,3 @@ static int pgp_send_menu (HEADER *msg, i
   case 2: /* (s)ign */
-    msg->security |= PGPSIGN;
+    msg->security ^= SIGN;
     break;
@@ -186,3 +197,3 @@ static int pgp_send_menu (HEADER *msg, i
       
-      msg->security |= PGPSIGN;
+      msg->security |= SIGN;
 	
@@ -192,3 +203,3 @@ static int pgp_send_menu (HEADER *msg, i
     {
-      msg->security &= ~PGPSIGN;
+      msg->security &= ~SIGN;
     }
@@ -199,8 +210,33 @@ static int pgp_send_menu (HEADER *msg, i
   case 4: /* (b)oth */
-    msg->security = PGPENCRYPT | PGPSIGN;
+    if ((msg->security & (ENCRYPT | SIGN)) == (ENCRYPT | SIGN))
+      msg->security = 0;
+    else
+      msg->security |= (ENCRYPT | SIGN);
     break;
 
-  case 5: /* (f)orget it */
+  case 5: /* (i)nline */
+    if ((msg->security & (ENCRYPT | SIGN)))
+      msg->security ^= INLINE;
+    else
+      msg->security &= ~INLINE;
+    break;
+
+  case 6: /* (f)orget it */
     msg->security = 0;
     break;
+  }
+
+  if (msg->security)
+  {
+    if (! (msg->security & (ENCRYPT | SIGN)))
+    {
+      msg->security = 0;
+    }
+    else
+    {
+      msg->security |= APPLICATION_PGP;
+
+      if (use_autoinline && option (OPTPGPAUTOINLINE))
+	msg->security |= INLINE;
+    }
   }
--- crypt.c Mar 2003 08:23:27 -0000	3.17
+++ crypt.c Apr 2003 04:55:01 -0000
@@ -161,3 +161,3 @@ int crypt_valid_passphrase(int flags)
 
-int mutt_protect (HEADER *msg, HEADER *cur, char *keylist)
+int mutt_protect (HEADER *msg, char *keylist)
 {
@@ -166,3 +166,2 @@ int mutt_protect (HEADER *msg, HEADER *c
   BODY *tmp_pgp_pbody = NULL;
-  int traditional = 0;
   int flags = (WithCrypto & APPLICATION_PGP)? msg->security: 0;
@@ -176,29 +175,9 @@ int mutt_protect (HEADER *msg, HEADER *c
 
-  if ((WithCrypto & APPLICATION_PGP) && (msg->security & APPLICATION_PGP))
+  if ((WithCrypto & APPLICATION_PGP) && ((msg->security & PGPINLINE) == PGPINLINE))
   {
-    if ((msg->content->type == TYPETEXT) &&
-	!ascii_strcasecmp (msg->content->subtype, "plain"))
-    {
-      if (cur && cur->security && option (OPTPGPAUTOTRAD)
-	  && (option (OPTCRYPTREPLYENCRYPT)
-	      || option (OPTCRYPTREPLYSIGN)
-	      || option (OPTCRYPTREPLYSIGNENCRYPTED)))
-	{
-	  if(mutt_is_application_pgp(cur->content))
-	    traditional = 1;
-	}
-      else
-	{
-	  if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create a traditional (inline) PGP message?"))) == -1)
-	    return -1;
-	  else if (i == M_YES)
-	    traditional = 1;
-	}
-    }
-    if (traditional)
+    /* they really want to send it inline... go for it */
+    if (!isendwin ()) mutt_endwin _("Invoking PGP...");
+    pbody = crypt_pgp_traditional_encryptsign (msg->content, flags, keylist);
+    if (pbody)
     {
-      if (!isendwin ()) mutt_endwin _("Invoking PGP...");
-      if (!(pbody = crypt_pgp_traditional_encryptsign (msg->content, flags, keylist)))
-	return -1;
-
       msg->content = pbody;
@@ -206,2 +185,8 @@ int mutt_protect (HEADER *msg, HEADER *c
     }
+
+    /* otherwise inline won't work...ask for revert */
+    if ((i = query_quadoption (OPT_PGPMIMEASK, _("Message can't be sent inline.  Revert to using PGP/MIME?"))) != M_YES)
+      return -1;
+
+    /* go ahead with PGP/MIME */
   }
@@ -391,2 +376,5 @@ int mutt_is_application_pgp (BODY *m)
   }
+  if (t)
+    t |= PGPINLINE;
+
   return t;
--- init.h Mar 2003 09:17:32 -0000	3.36
+++ init.h Apr 2003 04:55:02 -0000
@@ -1354,2 +1354,44 @@ struct option_t MuttVars[] = {
   */
+  { "pgp_create_traditional",	DT_SYN, R_NONE, UL "pgp_autoinline", 0 },
+  { "pgp_autoinline",		DT_BOOL, R_NONE, OPTPGPAUTOINLINE, 0 },
+  /*
+  ** .pp
+  ** This option controls whether Mutt generates old-style inline
+  ** (traditional) PGP encrypted or signed messages under certain
+  ** circumstances.  This can be overridden by use of the \fIpgp-menu\fP,
+  ** when inline is not required.
+  ** .pp
+  ** Note that Mutt might automatically use PGP/MIME for messages
+  ** which consist of more than a single MIME part.  Mutt can be
+  ** configured to ask before sending PGP/MIME messages when inline
+  ** (traditional) would not work.
+  ** See also: ``$$pgp_mime_ask''.
+  ** .pp
+  ** Also note that using the old-style PGP message format is \fBstrongly\fP
+  ** \fBdeprecated\fP.
+  ** (PGP only)
+  */
+  { "pgp_auto_traditional",	DT_SYN, R_NONE, UL "pgp_replyinline", 0 },
+  { "pgp_replyinline",		DT_BOOL, R_NONE, OPTPGPREPLYINLINE, 0 },
+  /*
+  ** .pp
+  ** Setting this variable will cause Mutt to always attempt to
+  ** create an inline (traditional) message when replying to a
+  ** message which is PGP encrypted/signed inline.  This can be
+  ** overridden by use of the \fIpgp-menu\fP, when inline is not
+  ** required.  This option does not automatically detect if the
+  ** (replied-to) message is inline; instead it relies on Mutt
+  ** internals for previously checked/flagged messages.
+  ** .pp
+  ** Note that Mutt might automatically use PGP/MIME for messages
+  ** which consist of more than a single MIME part.  Mutt can be
+  ** configured to ask before sending PGP/MIME messages when inline
+  ** (traditional) would not work.
+  ** See also: ``$$pgp_mime_ask''.
+  ** .pp
+  ** Also note that using the old-style PGP message format is \fBstrongly\fP
+  ** \fBdeprecated\fP.
+  ** (PGP only)
+  ** 
+  */
   { "pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, 1 },
@@ -1403,11 +1445,8 @@ struct option_t MuttVars[] = {
   */
-  { "pgp_create_traditional", DT_QUAD, R_NONE, OPT_PGPTRADITIONAL, M_NO },
+  { "pgp_mime_ask", DT_QUAD, R_NONE, OPT_PGPMIMEASK, M_NO },
   /*
   ** .pp
-  ** This option controls whether Mutt generates old-style inline PGP
-  ** encrypted or signed messages.
-  ** .pp
-  ** Note that PGP/MIME will be used automatically for messages which have
-  ** a character set different from us-ascii, or which consist of more than
-  ** a single MIME part.
+  ** This option controls whether Mutt will prompt you for
+  ** automatically sending a (signed/encrypted) message using
+  ** PGP/MIME when inline (traditional) fails (for any reason).
   ** .pp
@@ -1415,19 +1454,2 @@ struct option_t MuttVars[] = {
   ** \fBdeprecated\fP.
-  ** (PGP only)
-  */
-  { "pgp_auto_traditional", DT_BOOL, R_NONE, OPTPGPAUTOTRAD, 0 },
-  /*
-  ** .pp
-  ** This option causes Mutt to generate an old-style inline PGP
-  ** encrypted or signed message when replying to an old-style
-  ** message, and a PGP/MIME message when replying to a PGP/MIME
-  ** message.  Note that this option is only meaningful when using
-  ** ``$$crypt_replyencrypt'', ``$$crypt_replysign'', or
-  ** ``$$crypt_replysignencrypted''.
-  ** .pp
-  ** Also note that PGP/MIME will be used automatically for messages
-  ** which have a character set different from us-ascii, or which
-  ** consist of more than a single MIME part.
-  ** .pp
-  ** This option overrides ``$$pgp_create_traditional''
   ** (PGP only)
--- mutt.h Mar 2003 08:26:20 -0000	3.15
+++ mutt.h Apr 2003 04:55:02 -0000
@@ -265,3 +265,2 @@ enum
   OPT_VERIFYSIG,      /* verify PGP signatures */
-  OPT_PGPTRADITIONAL, /* create old-style PGP messages */
 
@@ -271,2 +270,3 @@ enum
 
+  OPT_PGPMIMEASK,     /* ask to revert to PGP/MIME when inline fails */
   OPT_PRINT,
@@ -438,3 +438,2 @@ enum
   OPTPGPLONGIDS,
-  OPTPGPAUTOTRAD,
 #if 0
@@ -446,2 +445,4 @@ enum
   OPTPGPSHOWUNUSABLE,
+  OPTPGPAUTOINLINE,
+  OPTPGPREPLYINLINE,
 
@@ -624,4 +625,4 @@ typedef struct header
 {
-  unsigned int security : 7;  /* bit 0-4: flags, bit 5,6: application.
-				 see: crypt.h pgplib.h, smime.h */
+  unsigned int security : 9;  /* bit 0-6: flags, bit 7,8: application.
+				 see: mutt_crypt.h */
 
--- mutt_crypt.h Jan 2003 23:54:30 -0000	3.4
+++ mutt_crypt.h Apr 2003 04:55:02 -0000
@@ -35,7 +35,9 @@
 #define GOODSIGN   (1 << 2)
-#define BADSIGN    (1 << 3) /* FIXME: value also used below for PGPKEY */
+#define BADSIGN    (1 << 3)
 #define SIGNOPAQUE (1 << 4)
+#define KEYBLOCK   (1 << 5) /* KEY too generic? */
+#define INLINE     (1 << 6)
 
-#define APPLICATION_PGP    (1 << 5) 
-#define APPLICATION_SMIME  (1 << 6)
+#define APPLICATION_PGP    (1 << 7) 
+#define APPLICATION_SMIME  (1 << 8)
 
@@ -44,3 +46,4 @@
 #define PGPGOODSIGN (APPLICATION_PGP | GOODSIGN)
-#define PGPKEY      (APPLICATION_PGP | (1 << 3)) 
+#define PGPKEY      (APPLICATION_PGP | KEYBLOCK) 
+#define PGPINLINE   (APPLICATION_PGP | INLINE)
 
@@ -103,3 +106,3 @@ typedef struct pgp_keyinfo *pgp_key_t;
 
-int mutt_protect (HEADER *, HEADER *, char *);
+int mutt_protect (HEADER *, char *);
 
--- postpone.c Jan 2003 12:33:41 -0000	3.8
+++ postpone.c Apr 2003 04:55:02 -0000
@@ -477,2 +477,7 @@ int mutt_parse_crypt_hdr (char *p, int s
 
+      case 'i':
+      case 'I':
+	pgp |= INLINE;
+	break;
+
       default:
--- send.c Mar 2003 21:23:53 -0000	3.21
+++ send.c Apr 2003 04:55:02 -0000
@@ -1252,5 +1252,12 @@ ci_send_message (int flags,		/* send mod
 	msg->security |= SIGN;
-      if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur && cur->security & ENCRYPT)
+      if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur && (cur->security & ENCRYPT))
 	msg->security |= SIGN;
-    }      
+      if (WithCrypto & APPLICATION_PGP && (msg->security & (ENCRYPT | SIGN)))
+      {
+	if (option (OPTPGPAUTOINLINE))
+	  msg->security |= INLINE;
+	if (option (OPTPGPREPLYINLINE) && cur && (cur->security & INLINE))
+	  msg->security |= INLINE;
+      }
+    }
 
@@ -1478,3 +1485,3 @@ main_loop:
       if ((crypt_get_keys (msg, &pgpkeylist) == -1) ||
-          mutt_protect (msg, cur, pgpkeylist) == -1)
+          mutt_protect (msg, pgpkeylist) == -1)
       {
@@ -1558,3 +1565,3 @@ main_loop:
 
-	  if (mutt_protect (msg, cur, pgpkeylist) == -1)
+	  if (mutt_protect (msg, pgpkeylist) == -1)
 	  {
--- sendlib.c Mar 2003 13:00:03 -0000	3.21
+++ sendlib.c Apr 2003 04:55:02 -0000
@@ -2408,2 +2408,4 @@ int mutt_write_fcc (const char *path, HE
     }
+    if (hdr->security & INLINE)
+      fputc ('I', msg->fp);
     fputc ('\n', msg->fp);
--- po/ca.po Mar 2003 22:43:06 -0000	3.9
+++ po/ca.po Apr 2003 04:55:03 -0000
@@ -607,10 +607,10 @@ msgstr "Xifra"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(x)ifra, (s)igna, s(i)gna com a, (a)mbd�s, o en (c)lar? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "(x)ifra, (s)igna, s(i)gna com a, (a)mbd�s, en (l)�nia, o en (c)lar? "
 
 # ivb (2001/11/19)
-# ivb  (x)ifra, (s)igna, s(i)gna com a, (a)mbd�s, (c)lar
+# ivb  (x)ifra, (s)igna, s(i)gna com a, (a)mbd�s, en (l)�nia, o en (c)lar
 #: compose.c:166
-msgid "esabf"
-msgstr "xsiac"
+msgid "esabif"
+msgstr "xsialc"
 
--- po/cs.po Mar 2003 22:43:06 -0000	3.8
+++ po/cs.po Apr 2003 04:55:03 -0000
@@ -687,4 +687,4 @@ msgstr "Za�ifrovat"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(�)ifrovat, (p)odepsat, podepsat (j)ako, (o)boj�, �i (n)ic?"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "(�)ifrovat, (p)odepsat, podepsat (j)ako, (o)boj�, p��(m)�, �i (n)ic?"
 
@@ -692,4 +692,4 @@ msgstr "(�)ifrovat, (p)odepsat, podepsat
 #: compose.c:166
-msgid "esabf"
-msgstr "�pjon"
+msgid "esabif"
+msgstr "�pjomn"
 
--- po/da.po Mar 2003 22:43:06 -0000	3.8
+++ po/da.po Apr 2003 04:55:03 -0000
@@ -577,8 +577,8 @@ msgstr "Krypt�r"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(k)rypt�r, (u)nderskriv, underskriv (s)om, (b)egge, (i)ngen PGP"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "(k)rypt�r, (u)nderskriv, underskriv (s)om, (b)egge, i(n)tegreret, (i)ngen PGP"
 
 #: compose.c:166
-msgid "esabf"
-msgstr "kusbi"
+msgid "esabif"
+msgstr "kusbni"
 
--- po/de.po Mar 2003 22:43:06 -0000	3.10
+++ po/de.po Apr 2003 04:55:04 -0000
@@ -570,8 +570,8 @@ msgstr "Verschl�sseln mit: "
 #: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, (k)ein PGP? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, (i)nline, (k)ein PGP? "
 
 #: compose.c:166
-msgid "esabf"
-msgstr "vsabk"
+msgid "esabif"
+msgstr "vsabik"
 
--- po/el.po Mar 2003 22:43:06 -0000	3.9
+++ po/el.po Apr 2003 04:55:04 -0000
@@ -700,4 +700,4 @@ msgstr "������������� ��: "
 #: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, � (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)�������, � (f)orget it? "
 
@@ -706,4 +706,4 @@ msgstr "PGP (e)ncrypt, (s)ign, sign (a)s
 #: compose.c:166
-msgid "esabf"
-msgstr "esabf"
+msgid "esabif"
+msgstr "esabif"
 
--- po/eo.po Mar 2003 22:43:06 -0000	3.8
+++ po/eo.po Apr 2003 04:55:04 -0000
@@ -577,8 +577,8 @@ msgstr "�ifri"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "�(i)fri, (s)ubskribi, subskribi (k)iel, (a)mba�, a� (f)orgesi? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "�(i)fri, (s)ubskribi, subskribi (k)iel, (a)mba�, \"i(n)line\", a� (f)orgesi? "
 
 #: compose.c:166
-msgid "esabf"
-msgstr "iskaf"
+msgid "esabif"
+msgstr "iskanf"
 
--- po/es.po Mar 2003 22:43:06 -0000	3.10
+++ po/es.po Apr 2003 04:55:05 -0000
@@ -575,8 +575,9 @@ msgstr "Cifrar"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "�co(d)ificar, f(i)rmar (c)omo, amb(o)s o ca(n)celar? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "�co(d)ificar, f(i)rmar (c)omo, amb(o)s, inc(l)uido, o ca(n)celar? "
+
 
 #: compose.c:166
-msgid "esabf"
-msgstr "dicon"
+msgid "esabif"
+msgstr "dicoln"
 
--- po/et.po Mar 2003 22:43:07 -0000	3.10
+++ po/et.po Apr 2003 04:55:05 -0000
@@ -570,8 +570,8 @@ msgstr "Kr�pti kasutades: "
 #: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (k)r�pti, (a)llkiri, allk. ku(i), (m)�lemad v�i (u)nusta? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "PGP (k)r�pti, (a)llkiri, allk. ku(i), (m)�lemad, k(e)hasse, v�i (u)nusta? "
 
 #: compose.c:166
-msgid "esabf"
-msgstr "kaimu"
+msgid "esabif"
+msgstr "kaimeu"
 
--- po/fr.po Mar 2003 22:43:07 -0000	3.18
+++ po/fr.po Apr 2003 04:55:05 -0000
@@ -596,8 +596,8 @@ msgstr "Chiffrer avec : "
 #: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, ou (o)ublier ? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, en (l)igne, ou (o)ublier ? "
 
 #: compose.c:166
-msgid "esabf"
-msgstr "csedo"
+msgid "esabif"
+msgstr "csedlo"
 
--- po/gl.po Mar 2003 22:43:07 -0000	3.8
+++ po/gl.po Apr 2003 04:55:06 -0000
@@ -579,8 +579,8 @@ msgstr "Encriptar"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "�(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas ou (o)lvidar? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "�(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas, (i)nterior, ou (o)lvidar? "
 
 #: compose.c:166
-msgid "esabf"
-msgstr "efcao"
+msgid "esabif"
+msgstr "efcaio"
 
--- po/hu.po Mar 2003 22:43:07 -0000	3.8
+++ po/hu.po Apr 2003 04:55:06 -0000
@@ -580,8 +580,8 @@ msgstr "Titkos�t"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(t)itkos�t, (a)l��r, al��r (m)int, titkos�t �(s) al��r, m�(g)se? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "(t)itkos�t, (a)l��r, al��r (m)int, titkos�t �(s) al��r, (b)e�gyazott, m�(g)se? "
 
 #: compose.c:166
-msgid "esabf"
-msgstr "tamsg"
+msgid "esabif"
+msgstr "tamsbg"
 
--- po/id.po Mar 2003 22:43:07 -0000	3.9
+++ po/id.po Apr 2003 04:55:06 -0000
@@ -574,8 +574,8 @@ msgstr "Enkrip dengan: "
 #: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, (b)atal? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, (i)nline, (b)atal? "
 
 #: compose.c:166
-msgid "esabf"
-msgstr "etsdb"
+msgid "esabif"
+msgstr "etsdib"
 
--- po/it.po Mar 2003 22:43:07 -0000	3.8
+++ po/it.po Apr 2003 04:55:07 -0000
@@ -581,8 +581,8 @@ msgstr "Crittografa"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "cifra(e), firma(s), firma come(a), entrambi(b), annulla(f) "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "cifra(e), firma(s), firma come(a), entrambi(b), in l(i)nea , annulla(f) "
 
 #: compose.c:166
-msgid "esabf"
-msgstr "esabf"
+msgid "esabif"
+msgstr "esabif"
 
--- po/ja.po Mar 2003 22:43:07 -0000	3.15
+++ po/ja.po Apr 2003 04:55:07 -0000
@@ -570,8 +570,8 @@ msgstr "  �Ź沽����: "
 #: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (e)�Ź沽,(s)��̾,(a)..�Ȥ��ƽ�̾,(b)ξ��,(f)���?"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "PGP (e)�Ź沽,(s)��̾,(a)..�Ȥ��ƽ�̾,(b)ξ��,(i)nline,(f)���?"
 
 #: compose.c:166
-msgid "esabf"
-msgstr ""
+msgid "esabif"
+msgstr "esabif"
 
--- po/ko.po Mar 2003 22:43:07 -0000	3.11
+++ po/ko.po Apr 2003 04:55:07 -0000
@@ -572,8 +572,8 @@ msgstr "��ȣȭ ���: "
 #: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP ��ȣȭ(e), ����(s), ��� ����(a), �� ��(b), ���(f)? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "PGP ��ȣȭ(e), ����(s), ��� ����(a), �� ��(b), (i)nline, ���(f)? "
 
 #: compose.c:166
-msgid "esabf"
-msgstr "esabf"
+msgid "esabif"
+msgstr "esabif"
 
--- po/lt.po Mar 2003 22:43:07 -0000	3.8
+++ po/lt.po Apr 2003 04:55:07 -0000
@@ -577,5 +577,5 @@ msgstr "U��ifruoti"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
 msgstr ""
-"(u)��ifruot, pa(s)ira�yt, pasira�yt k(a)ip, a(b)u, rinktis (m)ic algoritm�, "
+"(u)��ifruot, pa(s)ira�yt, pasira�yt k(a)ip, a(b)u, (l)ai�ke, "
 "ar (p)amir�ti?"
@@ -584,4 +584,4 @@ msgstr ""
 #, fuzzy
-msgid "esabf"
-msgstr "usabmp"
+msgid "esabif"
+msgstr "usablp"
 
@@ -597,4 +597,3 @@ msgid ""
 msgstr ""
-"(u)��ifruot, pa(s)ira�yt, pasira�yt k(a)ip, a(b)u, rinktis (m)ic algoritm�, "
-"ar (p)amir�ti?"
+"(u)��ifruot, pa(s)ira�yt, u��ifruo(t) su, pasira�yt k(a)ip, a(b)u, ar (p)amir�ti?"
 
@@ -603,3 +602,3 @@ msgstr ""
 msgid "eswabf"
-msgstr "usabmp"
+msgstr "ustabp"
 
--- po/nl.po Mar 2003 22:43:07 -0000	3.10
+++ po/nl.po Apr 2003 04:55:08 -0000
@@ -569,8 +569,8 @@ msgstr "Versleutelen met: "
 #: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eide, (g)een? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eide, ber(i)cht, (g)een? "
 
 #: compose.c:166
-msgid "esabf"
-msgstr "voabg"
+msgid "esabif"
+msgstr "voabig"
 
--- po/pl.po Mar 2003 22:43:08 -0000	3.11
+++ po/pl.po Apr 2003 04:55:08 -0000
@@ -572,8 +572,8 @@ msgstr "Zaszyfruj u�ywaj�c: "
 #: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, b(e)z PGP? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, (i)nline, b(e)z PGP? "
 
 #: compose.c:166
-msgid "esabf"
-msgstr "zsabe"
+msgid "esabif"
+msgstr "zsabie"
 
--- po/pt_BR.po Mar 2003 22:43:08 -0000	3.9
+++ po/pt_BR.po Apr 2003 04:55:08 -0000
@@ -580,5 +580,5 @@ msgstr "Encriptar"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
 msgstr ""
-"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, escolhe (m)ic, ou es(q)uece? "
+"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, em l(i)nha, ou es(q)uece? "
 
@@ -586,4 +586,4 @@ msgstr ""
 #, fuzzy
-msgid "esabf"
-msgstr "escamq"
+msgid "esabif"
+msgstr "escaiq"
 
@@ -599,3 +599,3 @@ msgid ""
 msgstr ""
-"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, escolhe (m)ic, ou es(q)uece? "
+"(e)ncripa, a(s)sina, e(n)cripa com, assina (c)omo, (a)mbos, ou es(q)uece? "
 
@@ -604,3 +604,3 @@ msgstr ""
 msgid "eswabf"
-msgstr "escamq"
+msgstr "esncaq"
 
--- po/ru.po Mar 2003 22:43:08 -0000	3.13
+++ po/ru.po Apr 2003 04:55:09 -0000
@@ -578,8 +578,8 @@ msgstr "�����������: "
 #: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (e)����, (s)�������, (a)������� ���, (b)���, (f)����������? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "PGP (e)����, (s)�������, (a)������� ���, (b)���, (i)nline, (f)����������? "
 
 #: compose.c:166
-msgid "esabf"
-msgstr "esabf"
+msgid "esabif"
+msgstr "esabif"
 
--- po/sk.po Mar 2003 22:43:08 -0000	3.8
+++ po/sk.po Apr 2003 04:55:09 -0000
@@ -585,5 +585,5 @@ msgstr "Za�ifruj"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
 msgstr ""
-"(e)-�ifr, (s)-podp, podp (a)ko, o(b)e, ozna� alg. mi(c), alebo (f)-zabudn�� "
+"(e)-�ifr, (s)-podp, podp (a)ko, o(b)e, (i)nline, alebo (f)-zabudn�� "
 "na to? "
@@ -592,4 +592,4 @@ msgstr ""
 #, fuzzy
-msgid "esabf"
-msgstr "esabmf"
+msgid "esabif"
+msgstr "esabif"
 
@@ -605,4 +605,3 @@ msgid ""
 msgstr ""
-"(e)-�ifr, (s)-podp, podp (a)ko, o(b)e, ozna� alg. mi(c), alebo (f)-zabudn�� "
-"na to? "
+"(e)-�ifr, (s)-podp, (w)-�ifr s, podp (a)ko, o(b)e, alebo (f)-zabudn�� na to? "
 
@@ -611,3 +610,3 @@ msgstr ""
 msgid "eswabf"
-msgstr "esabmf"
+msgstr "eswabf"
 
--- po/sv.po Mar 2003 22:43:08 -0000	3.9
+++ po/sv.po Apr 2003 04:55:09 -0000
@@ -567,8 +567,8 @@ msgstr "Kryptera med: "
 #: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP: (k)ryptera, (s)ignera, signera s(o)m, (b)�da, eller sk(i)ppa det?"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "PGP: (k)ryptera, (s)ignera, signera s(o)m, (b)�da, i(n)fogat, eller sk(i)ppa det?"
 
 #: compose.c:166
-msgid "esabf"
-msgstr "ksobi"
+msgid "esabif"
+msgstr "ksobni"
 
--- po/tr.po Mar 2003 22:43:08 -0000	3.8
+++ po/tr.po Apr 2003 04:55:10 -0000
@@ -576,5 +576,5 @@ msgstr "�ifrele"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
 msgstr ""
-"�(i)frele, i(m)zala, (f)arkl� imzala, i(k)isi de, mi(c) algoritmini se� "
+"�(i)frele, i(m)zala, (f)arkl� imzala, i(k)isi de, (i)nline, "
 "yoksa i(p)talm�? "
@@ -582,4 +582,4 @@ msgstr ""
 #: compose.c:166
-msgid "esabf"
-msgstr "imfkcp"
+msgid "esabif"
+msgstr "imfkip"
 
--- po/uk.po Mar 2003 22:43:08 -0000	3.9
+++ po/uk.po Apr 2003 04:55:10 -0000
@@ -571,8 +571,8 @@ msgstr "����������"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "����.(e), Ц��.(s), Ц��. ��(a), ���(b) �� צ�ͦ��(f)? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "����.(e), Ц��.(s), Ц��. ��(a), ���(b), (i)nline �� צ�ͦ��(f)? "
 
 #: compose.c:166
-msgid "esabf"
-msgstr ""
+msgid "esabif"
+msgstr "esabif"
 
--- po/zh_CN.po Mar 2003 22:43:08 -0000	3.8
+++ po/zh_CN.po Apr 2003 04:55:10 -0000
@@ -584,5 +584,5 @@ msgstr "����"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
 msgstr ""
-"(e)����, (s)ǩ��, (a)�ñ������ǩ, (b)���߽�Ҫ, ѡ�� (m)ic ���㷨 �� (f)��"
+"(e)����, (s)ǩ��, (a)�ñ������ǩ, (b)���߽�Ҫ, (i)nline, �� (f)��"
 "����"
@@ -590,4 +590,4 @@ msgstr ""
 #: compose.c:166
-msgid "esabf"
-msgstr ""
+msgid "esabif"
+msgstr "esabif"
 
--- po/zh_TW.po Mar 2003 22:43:08 -0000	3.8
+++ po/zh_TW.po Apr 2003 04:55:11 -0000
@@ -576,3 +576,3 @@ msgstr "加密"
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
@@ -580,4 +580,4 @@ msgstr "(1)加密, (2)簽名, (3)用別�
 #: compose.c:166
-msgid "esabf"
-msgstr "12345"
+msgid "esabif"
+msgstr "1234i5"