better version of defaulting English responces patch

3 files changed, 162 insertions, 189 deletions

diff --git a/mail/mutt-devel/files/patch-05 b/mail/mutt-devel/files/patch-05
index 1705a98ba6fd..01e1c45a2846 100644
--- a/mail/mutt-devel/files/patch-05
+++ b/mail/mutt-devel/files/patch-05
@@ -1,60 +1,5 @@
---- protos.h.bak	Thu Feb 11 00:47:26 1999
-+++ protos.h	Tue Feb 16 16:35:23 1999
-@@ -239,7 +239,7 @@
- int mutt_is_list_recipient (int, ADDRESS *, ADDRESS *);
- int mutt_is_text_type (int, char *);
- int mutt_is_valid_mailbox (const char *);
--int mutt_multi_choice (char *prompt, char *letters);
-+int mutt_multi_choice (char *prompt, char *nletters, char *letters);
- int mutt_needs_mailcap (BODY *);
- int mutt_num_postponed (void);
- int mutt_parse_bind (BUFFER *, BUFFER *, unsigned long, BUFFER *);
---- browser.c.bak	Thu Jan  7 12:14:39 1999
-+++ browser.c	Tue Feb 16 16:38:56 1999
-@@ -743,7 +743,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")))
-+	      _("dazn"), "dazn"))
- 	  {
- 	    case -1: /* abort */
- 	      resort = 0;
---- commands.c.bak	Tue Feb  9 23:53:38 1999
-+++ commands.c	Tue Feb 16 16:38:56 1999
-@@ -333,7 +333,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")))
-+			     _("dfrsotuzc"), "dfrsotuzc"))
-   {
-   case -1: /* abort - don't resort */
-     return -1;
---- compose.c.bak	Tue Jan 26 11:40:36 1999
-+++ compose.c	Tue Feb 16 16:38:57 1999
-@@ -130,7 +130,7 @@
-   struct pgp_vinfo *pgp = pgp_get_vinfo(PGP_SIGN);
- 
-   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget it? "),
--			     _("esabmf")))
-+			     _("esabmf"), "esabmf"))
-   {
-   case 1: /* (e)ncrypt */
-     bits |= PGPENCRYPT;
---- lib.c.bak	Thu Feb 11 00:54:01 1999
-+++ lib.c	Tue Feb 16 16:38:57 1999
-@@ -795,7 +795,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?"), _("oac"), "oac"))
-     {
-       case -1: /* abort */
-       case 3:  /* cancel */
 --- curs_lib.c.orig	Thu Jan 14 14:29:17 1999
-+++ curs_lib.c	Tue Feb 16 16:42:19 1999
++++ curs_lib.c	Thu Feb 18 20:58:46 1999
 @@ -132,8 +132,8 @@
  int mutt_yesorno (const char *msg, int def)
  {
@@ -83,16 +28,18 @@
      else
      {
        BEEP();
-@@ -404,7 +414,7 @@
- }
- #endif
- 
--int mutt_multi_choice (char *prompt, char *letters)
-+int mutt_multi_choice (char *prompt, char *nletters, char *letters)
+@@ -408,8 +418,9 @@
  {
    event_t ch;
    int choice;
-@@ -423,6 +433,12 @@
+-  char *p;
++  char *p, *nletters;
+ 
++  nletters = _(letters);
+   mvaddstr (LINES - 1, 0, prompt);
+   clrtoeol ();
+   FOREVER
+@@ -423,6 +434,12 @@
      }
      else
      {
@@ -105,3 +52,47 @@
        p = strchr (letters, ch.ch);
        if (p)
        {
+--- browser.c.bak	Thu Jan  7 12:14:39 1999
++++ browser.c	Thu Feb 18 20:58:45 1999
+@@ -743,7 +743,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.bak	Tue Feb  9 23:53:38 1999
++++ commands.c	Thu Feb 18 20:58:45 1999
+@@ -333,7 +333,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.bak	Tue Jan 26 11:40:36 1999
++++ compose.c	Thu Feb 18 20:58:46 1999
+@@ -130,7 +130,7 @@
+   struct pgp_vinfo *pgp = pgp_get_vinfo(PGP_SIGN);
+ 
+   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget it? "),
+-			     _("esabmf")))
++			     N_("esabmf")))
+   {
+   case 1: /* (e)ncrypt */
+     bits |= PGPENCRYPT;
+--- lib.c.bak	Thu Feb 11 00:54:01 1999
++++ lib.c	Thu Feb 18 20:58:46 1999
+@@ -795,7 +795,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 */
diff --git a/mail/mutt/files/patch-05 b/mail/mutt/files/patch-05
index 1705a98ba6fd..01e1c45a2846 100644
--- a/mail/mutt/files/patch-05
+++ b/mail/mutt/files/patch-05
@@ -1,60 +1,5 @@
---- protos.h.bak	Thu Feb 11 00:47:26 1999
-+++ protos.h	Tue Feb 16 16:35:23 1999
-@@ -239,7 +239,7 @@
- int mutt_is_list_recipient (int, ADDRESS *, ADDRESS *);
- int mutt_is_text_type (int, char *);
- int mutt_is_valid_mailbox (const char *);
--int mutt_multi_choice (char *prompt, char *letters);
-+int mutt_multi_choice (char *prompt, char *nletters, char *letters);
- int mutt_needs_mailcap (BODY *);
- int mutt_num_postponed (void);
- int mutt_parse_bind (BUFFER *, BUFFER *, unsigned long, BUFFER *);
---- browser.c.bak	Thu Jan  7 12:14:39 1999
-+++ browser.c	Tue Feb 16 16:38:56 1999
-@@ -743,7 +743,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")))
-+	      _("dazn"), "dazn"))
- 	  {
- 	    case -1: /* abort */
- 	      resort = 0;
---- commands.c.bak	Tue Feb  9 23:53:38 1999
-+++ commands.c	Tue Feb 16 16:38:56 1999
-@@ -333,7 +333,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")))
-+			     _("dfrsotuzc"), "dfrsotuzc"))
-   {
-   case -1: /* abort - don't resort */
-     return -1;
---- compose.c.bak	Tue Jan 26 11:40:36 1999
-+++ compose.c	Tue Feb 16 16:38:57 1999
-@@ -130,7 +130,7 @@
-   struct pgp_vinfo *pgp = pgp_get_vinfo(PGP_SIGN);
- 
-   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget it? "),
--			     _("esabmf")))
-+			     _("esabmf"), "esabmf"))
-   {
-   case 1: /* (e)ncrypt */
-     bits |= PGPENCRYPT;
---- lib.c.bak	Thu Feb 11 00:54:01 1999
-+++ lib.c	Tue Feb 16 16:38:57 1999
-@@ -795,7 +795,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?"), _("oac"), "oac"))
-     {
-       case -1: /* abort */
-       case 3:  /* cancel */
 --- curs_lib.c.orig	Thu Jan 14 14:29:17 1999
-+++ curs_lib.c	Tue Feb 16 16:42:19 1999
++++ curs_lib.c	Thu Feb 18 20:58:46 1999
 @@ -132,8 +132,8 @@
  int mutt_yesorno (const char *msg, int def)
  {
@@ -83,16 +28,18 @@
      else
      {
        BEEP();
-@@ -404,7 +414,7 @@
- }
- #endif
- 
--int mutt_multi_choice (char *prompt, char *letters)
-+int mutt_multi_choice (char *prompt, char *nletters, char *letters)
+@@ -408,8 +418,9 @@
  {
    event_t ch;
    int choice;
-@@ -423,6 +433,12 @@
+-  char *p;
++  char *p, *nletters;
+ 
++  nletters = _(letters);
+   mvaddstr (LINES - 1, 0, prompt);
+   clrtoeol ();
+   FOREVER
+@@ -423,6 +434,12 @@
      }
      else
      {
@@ -105,3 +52,47 @@
        p = strchr (letters, ch.ch);
        if (p)
        {
+--- browser.c.bak	Thu Jan  7 12:14:39 1999
++++ browser.c	Thu Feb 18 20:58:45 1999
+@@ -743,7 +743,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.bak	Tue Feb  9 23:53:38 1999
++++ commands.c	Thu Feb 18 20:58:45 1999
+@@ -333,7 +333,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.bak	Tue Jan 26 11:40:36 1999
++++ compose.c	Thu Feb 18 20:58:46 1999
+@@ -130,7 +130,7 @@
+   struct pgp_vinfo *pgp = pgp_get_vinfo(PGP_SIGN);
+ 
+   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget it? "),
+-			     _("esabmf")))
++			     N_("esabmf")))
+   {
+   case 1: /* (e)ncrypt */
+     bits |= PGPENCRYPT;
+--- lib.c.bak	Thu Feb 11 00:54:01 1999
++++ lib.c	Thu Feb 18 20:58:46 1999
+@@ -795,7 +795,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 */
diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-05
index 1705a98ba6fd..01e1c45a2846 100644
--- a/mail/mutt14/files/patch-05
+++ b/mail/mutt14/files/patch-05
@@ -1,60 +1,5 @@
---- protos.h.bak	Thu Feb 11 00:47:26 1999
-+++ protos.h	Tue Feb 16 16:35:23 1999
-@@ -239,7 +239,7 @@
- int mutt_is_list_recipient (int, ADDRESS *, ADDRESS *);
- int mutt_is_text_type (int, char *);
- int mutt_is_valid_mailbox (const char *);
--int mutt_multi_choice (char *prompt, char *letters);
-+int mutt_multi_choice (char *prompt, char *nletters, char *letters);
- int mutt_needs_mailcap (BODY *);
- int mutt_num_postponed (void);
- int mutt_parse_bind (BUFFER *, BUFFER *, unsigned long, BUFFER *);
---- browser.c.bak	Thu Jan  7 12:14:39 1999
-+++ browser.c	Tue Feb 16 16:38:56 1999
-@@ -743,7 +743,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")))
-+	      _("dazn"), "dazn"))
- 	  {
- 	    case -1: /* abort */
- 	      resort = 0;
---- commands.c.bak	Tue Feb  9 23:53:38 1999
-+++ commands.c	Tue Feb 16 16:38:56 1999
-@@ -333,7 +333,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")))
-+			     _("dfrsotuzc"), "dfrsotuzc"))
-   {
-   case -1: /* abort - don't resort */
-     return -1;
---- compose.c.bak	Tue Jan 26 11:40:36 1999
-+++ compose.c	Tue Feb 16 16:38:57 1999
-@@ -130,7 +130,7 @@
-   struct pgp_vinfo *pgp = pgp_get_vinfo(PGP_SIGN);
- 
-   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget it? "),
--			     _("esabmf")))
-+			     _("esabmf"), "esabmf"))
-   {
-   case 1: /* (e)ncrypt */
-     bits |= PGPENCRYPT;
---- lib.c.bak	Thu Feb 11 00:54:01 1999
-+++ lib.c	Tue Feb 16 16:38:57 1999
-@@ -795,7 +795,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?"), _("oac"), "oac"))
-     {
-       case -1: /* abort */
-       case 3:  /* cancel */
 --- curs_lib.c.orig	Thu Jan 14 14:29:17 1999
-+++ curs_lib.c	Tue Feb 16 16:42:19 1999
++++ curs_lib.c	Thu Feb 18 20:58:46 1999
 @@ -132,8 +132,8 @@
  int mutt_yesorno (const char *msg, int def)
  {
@@ -83,16 +28,18 @@
      else
      {
        BEEP();
-@@ -404,7 +414,7 @@
- }
- #endif
- 
--int mutt_multi_choice (char *prompt, char *letters)
-+int mutt_multi_choice (char *prompt, char *nletters, char *letters)
+@@ -408,8 +418,9 @@
  {
    event_t ch;
    int choice;
-@@ -423,6 +433,12 @@
+-  char *p;
++  char *p, *nletters;
+ 
++  nletters = _(letters);
+   mvaddstr (LINES - 1, 0, prompt);
+   clrtoeol ();
+   FOREVER
+@@ -423,6 +434,12 @@
      }
      else
      {
@@ -105,3 +52,47 @@
        p = strchr (letters, ch.ch);
        if (p)
        {
+--- browser.c.bak	Thu Jan  7 12:14:39 1999
++++ browser.c	Thu Feb 18 20:58:45 1999
+@@ -743,7 +743,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.bak	Tue Feb  9 23:53:38 1999
++++ commands.c	Thu Feb 18 20:58:45 1999
+@@ -333,7 +333,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.bak	Tue Jan 26 11:40:36 1999
++++ compose.c	Thu Feb 18 20:58:46 1999
+@@ -130,7 +130,7 @@
+   struct pgp_vinfo *pgp = pgp_get_vinfo(PGP_SIGN);
+ 
+   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget it? "),
+-			     _("esabmf")))
++			     N_("esabmf")))
+   {
+   case 1: /* (e)ncrypt */
+     bits |= PGPENCRYPT;
+--- lib.c.bak	Thu Feb 11 00:54:01 1999
++++ lib.c	Thu Feb 18 20:58:46 1999
+@@ -795,7 +795,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 */