--- curs_lib.c.old	Wed Sep  1 19:39:20 1999
+++ curs_lib.c	Sun Sep 26 23:47:03 1999
@@ -156,6 +156,16 @@
       def = 0;
       break;
     }
+    else if (tolower(ch.ch) == 'y')
+    {
+      def = 1;
+      break;
+    }
+    else if (tolower(ch.ch) == 'n')
+    {
+      def = 0;
+      break;
+    }
     else
     {
       BEEP();
@@ -413,8 +423,9 @@
 {
   event_t ch;
   int choice;
-  char *p;
+  char *p, *nletters;
 
+  nletters = _(letters);
   mvaddstr (LINES - 1, 0, prompt);
   clrtoeol ();
   FOREVER
@@ -428,6 +439,12 @@
     }
     else
     {
+      p = strchr (nletters, ch.ch);
+      if (p)
+      {
+	choice = p - nletters + 1;
+	break;
+      }
       p = strchr (letters, ch.ch);
       if (p)
       {
--- browser.c.orig	Fri Sep 24 01:08:08 1999
+++ browser.c	Sun Sep 26 23:46:25 1999
@@ -750,7 +750,7 @@
 	  switch (mutt_multi_choice ((reverse) ?
 	      _("Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ") :
 	      _("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "),
-	      _("dazn")))
+	      N_("dazn")))
 	  {
 	    case -1: /* abort */
 	      resort = 0;
--- commands.c.orig	Wed Jul  7 02:56:24 1999
+++ commands.c	Sun Sep 26 23:46:25 1999
@@ -337,7 +337,7 @@
   switch (mutt_multi_choice (reverse ?
 			     _("Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: ") :
 			     _("Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "),
-			     _("dfrsotuzc")))
+			     N_("dfrsotuzc")))
   {
   case -1: /* abort - don't resort */
     return -1;
--- compose.c.orig	Tue Mar 26 23:03:26 2002
+++ compose.c	Thu May  2 09:21:11 2002
@@ -173,7 +173,7 @@
   char input_signas[SHORT_STRING];
 
   switch (mutt_multi_choice (_("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
-			     _("esabf")))
+			     N_("esabf")))
   {
   case 1: /* (e)ncrypt */
     msg->security |= PGPENCRYPT;
@@ -229,7 +229,7 @@
     char *p;
 
   switch (mutt_multi_choice (_("S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "),
-			     _("ewsabf")))
+			     N_("ewsabf")))
   {
   case 1: /* (e)ncrypt */
     msg->security |= SMIMEENCRYPT;
@@ -239,7 +239,7 @@
     msg->security |= SMIMEENCRYPT;
     switch (mutt_multi_choice (_("1: DES, 2: Tripple-DES, 3: RC2-40,"
 				 " 4: RC2-64, 5: RC2-128, or (f)orget it? "),
-			       _("12345f"))) {
+			       N_("12345f"))) {
     case 1:
 	mutt_str_replace (&SmimeCryptAlg, "des");
 	break;
--- muttlib.c.orig	Sun Apr  9 14:39:02 2000
+++ muttlib.c	Fri May 12 11:26:58 2000
@@ -671,7 +671,7 @@
   if (*append == 0 && access (fname, F_OK) == 0)
   {
     switch (mutt_multi_choice
-	    (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), _("oac")))
+	    (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), N_("oac")))
     {
       case -1: /* abort */
       case 3:  /* cancel */