--- pine/other.c.orig	Thu Jul 11 07:05:59 1996
+++ pine/other.c	Sat Jan 17 21:08:31 1998
@@ -248,8 +248,8 @@
 	    char prompt[50];
 
 	    sprintf(prompt,
-		"%s password to LOCK keyboard %s: ",
-		i ? "Retype" : "Enter",
+		"%swLKX %s: ",
+		i ? "sJ" : "J",
 		i > 1 ? "(Yes, again) " : "");
 
 	    rc =  optionally_enter(pw, -FOOTER_ROWS(ps), 0, 30, 0, 1,
@@ -506,8 +506,8 @@
     char     *rstr = NULL;
     void    (*redraw)() = ps_global->redrawer;
     static ESCKEY_S opts[] = {
-	{'y', 'y', "Y", "Yes"},
-	{'n', 'n', "N", "No"},
+	{'y', 'y', "Y", "O"},
+	{'n', 'n', "N", "_"},
 	{-1, 0, NULL, NULL}
     };
 
@@ -515,18 +515,18 @@
     fix_windsize(ps_global);
 
     while(1){
-	rv = radio_buttons("Exit editor and apply changes? ",
+	rv = radio_buttons("sîMΧ? ",
 			   -FOOTER_ROWS(ps_global), opts,
 			   'y', 'x', NO_HELP, RB_NORM);
 	if(rv == 'y'){				/* user ACCEPTS! */
 	    break;
 	}
 	else if(rv == 'n'){			/* Declined! */
-	    rstr = "No Changes Saved";
+	    rstr = "ܨås";
 	    break;
 	}
 	else if(rv == 'x'){			/* Cancelled! */
-	    rstr = "Exit Cancelled";
+	    rstr = "";
 	    break;
 	}
     }
@@ -542,39 +542,39 @@
  */
 
 static struct key config_text_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
-	{"E","Exit Config",KS_EXITMODE},{"C","[Change Val]",KS_NONE},
-	{"P","Prev",KS_NONE},		{"N","Next",KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
-	{"A","Add Value",KS_NONE},	{"D","Delete Val",KS_NONE},
-	{"Y","prYnt",KS_PRINT},		{"W","WhereIs",KS_WHEREIS}};
+       {{"?","U",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
+	{"E","]w",KS_EXITMODE},{"C","[ק]w]",KS_NONE},
+	{"P","e@",KS_NONE},		{"N","@",KS_NONE},
+	{"-","W@",KS_PREVPAGE},	{"Spc","U@",KS_NEXTPAGE},
+	{"A","[J]w",KS_NONE},	{"D","R]w",KS_NONE},
+	{"Y","CL",KS_PRINT},		{"W","jM",KS_WHEREIS}};
 INST_KEY_MENU(config_text_keymenu, config_text_keys);
 
 static struct key config_checkbox_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
-	{"E","Exit Config",KS_EXITMODE},{"X","[Set/Unset]",KS_NONE},
-	{"P","Prev",KS_NONE},		{"N","Next",KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
+       {{"?","U",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
+	{"E","]w",KS_EXITMODE},{"X","[]w/]w]",KS_NONE},
+	{"P","e@",KS_NONE},		{"N","@",KS_NONE},
+	{"-","W@",KS_PREVPAGE},	{"Spc","U@",KS_NEXTPAGE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
-	{"Y","prYnt",KS_PRINT},		{"W","WhereIs",KS_WHEREIS}};
+	{"Y","CL",KS_PRINT},		{"W","jM",KS_WHEREIS}};
 INST_KEY_MENU(config_checkbox_keymenu, config_checkbox_keys);
 
 static struct key config_radiobutton_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
-	{"E","Exit Config",KS_EXITMODE},{"*","[Select]",KS_NONE},
-	{"P","Prev",KS_NONE},		{"N","Next",KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
+       {{"?","U",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
+	{"E","]w",KS_EXITMODE},{"*","[]",KS_NONE},
+	{"P","e@",KS_NONE},		{"N","@",KS_NONE},
+	{"-","W@",KS_PREVPAGE},	{"Spc","U@",KS_NEXTPAGE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
-	{"Y","prYnt",KS_PRINT},		{"W","WhereIs",KS_WHEREIS}};
+	{"Y","CL",KS_PRINT},		{"W","jM",KS_WHEREIS}};
 INST_KEY_MENU(config_radiobutton_keymenu, config_radiobutton_keys);
 
 static struct key config_yesno_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
-	{"E","Exit Config",KS_EXITMODE},{"C","[Change]",KS_NONE},
-	{"P","Prev", KS_NONE},		{"N","Next", KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
+       {{"?","U",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
+	{"E","]w",KS_EXITMODE},{"C","[ק]",KS_NONE},
+	{"P","e@", KS_NONE},	{"N","@", KS_NONE},
+	{"-","W@",KS_PREVPAGE},	{"Spc","U@",KS_NEXTPAGE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
-	{"Y","prYnt",KS_PRINT},		{"W","WhereIs",KS_WHEREIS}};
+	{"Y","CL",KS_PRINT},		{"W","jM",KS_WHEREIS}};
 INST_KEY_MENU(config_yesno_keymenu, config_yesno_keys);
 
 /*
@@ -1137,21 +1137,21 @@
 
 #ifndef	DOS
 static struct key printer_edit_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{"Y","prYnt",KS_PRINT},
-	{"E","Exit Config",KS_EXITMODE},{"S","[Select]",KS_NONE},
-	{"P","Prev",KS_NONE},		{"N","Next",KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
+       {{"?","U",KS_SCREENHELP},	{"Y","CL",KS_PRINT},
+	{"E","]w",KS_EXITMODE},{"S","[Select]",KS_NONE},
+	{"P","e@",KS_NONE},		{"N","@",KS_NONE},
+	{"-","W@",KS_PREVPAGE},	{"Spc","U@",KS_NEXTPAGE},
 	{"A","Add Printer",KS_NONE},	{"D","DeletePrint",KS_NONE},
-	{"C","Change",KS_SELECT},	{"W","WhereIs",KS_WHEREIS}};
+	{"C","Change",KS_SELECT},	{"W","jM",KS_WHEREIS}};
 INST_KEY_MENU(printer_edit_keymenu, printer_edit_keys);
 
 static struct key printer_select_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{"Y","prYnt",KS_PRINT},
-	{"E","Exit Config",KS_EXITMODE},{"S","[Select]",KS_NONE},
-	{"P","Prev",KS_NONE},		{"N","Next",KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
+       {{"?","U",KS_SCREENHELP},	{"Y","CL",KS_PRINT},
+	{"E","]w",KS_EXITMODE},{"S","[Select]",KS_NONE},
+	{"P","e@",KS_NONE},		{"N","@",KS_NONE},
+	{"-","W@",KS_PREVPAGE},	{"Spc","U@",KS_NEXTPAGE},
 	{NULL,NULL,KS_NONE},	        {NULL,NULL,KS_NONE},
-	{NULL,NULL,KS_NONE},	        {"W","WhereIs",KS_WHEREIS}};
+	{NULL,NULL,KS_NONE},	        {"W","jM",KS_WHEREIS}};
 INST_KEY_MENU(printer_select_keymenu, printer_select_keys);
 
 /*
@@ -1604,12 +1604,12 @@
 
 
 static struct key flag_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
+       {{"?","U",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
 	{"E","Exit Flags",KS_EXITMODE}, {"X","[Set/Unset]",KS_NONE},
-	{"P","Prev",KS_NONE},		{"N","Next",KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
+	{"P","e@",KS_NONE},		{"N","@",KS_NONE},
+	{"-","W@",KS_PREVPAGE},	{"Spc","U@",KS_NEXTPAGE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
-	{"Y","prYnt",KS_PRINT},		{"W","WhereIs",KS_WHEREIS}};
+	{"Y","CL",KS_PRINT},		{"W","jM",KS_WHEREIS}};
 INST_KEY_MENU(flag_keymenu, flag_keys);
 
 /*----------------------------------------------------------------------
@@ -2139,7 +2139,7 @@
 		     "%s can't change options or settings",
 		     ps_global->restricted ? "Pine demo"
 					   : "Config file not editable,");
-		if(ch == 'e' || ch == PF3){
+		if(ch == 'e' || ch == PF3 || ch == KEY_LEFT){
 		    retval = 0;
 		    done++;
 		}
@@ -2717,7 +2717,7 @@
 		}
 
 		sprintf(prompt,
-		    "Enter text to insert before \"%.*s\": ",k,tmpval);
+		    "Jnb \"%.*s\" er: ",k,tmpval);
 	    }
 	    else if((*cl)->var->is_list
 		    && !(*cl)->var->user_val.l
@@ -2726,13 +2726,13 @@
 		ekey[0].ch    = 'r';
 		ekey[0].rval  = 'r';
 		ekey[0].name  = "R";
-		ekey[0].label = "Replace";
+		ekey[0].label = "N";
 		ekey[1].ch    = 'a';
 		ekey[1].rval  = 'a';
 		ekey[1].name  = "A";
-		ekey[1].label = "Add To";
+		ekey[1].label = "[";
 		ekey[2].ch    = -1;
-		strcpy(prompt, "Replace or Add To default value ? ");
+		strcpy(prompt, "N(R)Υ[(A)w] ? ");
 		switch(radio_buttons(prompt, -FOOTER_ROWS(ps), ekey, 'a', 'x',
 				     h_config_replace_add, RB_NORM)){
 		  case 'a':
@@ -2746,14 +2746,14 @@
 		    }
 
 add_text:
-		    sprintf(prompt, "Enter the %stext to be added : ",
-			flags&CF_NUMBER ? "numeric " : "");
+		    sprintf(prompt, "JQ[J%sr : ",
+			flags&CF_NUMBER ? "" : "");
 		    break;
 		    
 		  case 'r':
 replace_text:
-		    sprintf(prompt, "Enter the %sreplacement text : ",
-			flags&CF_NUMBER ? "numeric " : "");
+		    sprintf(prompt, "JQN%sr : ",
+			flags&CF_NUMBER ? "" : "");
 		    break;
 		    
 		  case 'x':
@@ -2763,8 +2763,8 @@
 		}
 	    }
 	    else
-	      sprintf(prompt, "Enter the %stext to be added : ",
-		    flags&CF_NUMBER ? "numeric " : "");
+	      sprintf(prompt, "JQ[J%sr : ",
+		    flags&CF_NUMBER ? "" : "");
 
 	    ps->mangled_footer = 1;
 	    help = NO_HELP;
@@ -2880,8 +2880,8 @@
 		    }
 
 		    sprintf(prompt,
-			"Enter text to insert %s \"%.*s\": ",
-			after ? "after" : "before", k, tmpval);
+			"JQnb \"%.*s\" %sr: ",
+			k, tmpval, after ? "" : "e");
 		    continue;
 		}
 		else if(i == ctrl('P')){
@@ -2995,7 +2995,8 @@
 		 	  : "<NULL VALUE>",
 		    (*cl)->var->name);
 	    else
-	        sprintf(prompt, "Really delete %s%.20s from %.30s ",
+	        sprintf(prompt, "Tw  %.30s R %s%.20s",
+	            (*cl)->var->name,
 		    (*cl)->var->is_list ? "item " : "", 
 		    (*cl)->var->is_list
 		      ? int2string((*cl)->varmem + 1)
@@ -3003,8 +3004,7 @@
 			  ? (!*(*cl)->var->user_val.p)
 			      ? empty_val2
 			      : (*cl)->var->user_val.p
-		 	  : "<NULL VALUE>",
-		    (*cl)->var->name);
+		 	  : "<NULL VALUE>");
 
 	    ps->mangled_footer = 1;
 	    if(want_to(prompt, 'n', 'n', NO_HELP, 0, 1) == 'y'){
@@ -3213,6 +3213,7 @@
 
 	break;
 
+     /* case KEY_LEFT:*/
       case 'e' :				/* exit */
       case PF3 :
 	rv = config_exit_cmd(flags);
@@ -3498,6 +3499,7 @@
 
 	break;
 
+      case KEY_LEFT:
       case 'e' :				/* exit */
       case PF3 :
 	rv = config_exit_cmd(flags);
@@ -3542,6 +3544,7 @@
 	rv = 1;
 	break;
 
+      case KEY_LEFT:
       case 'e' :				/* exit */
       case PF3 :
 	rv = flag_exit_cmd(flags);
@@ -3678,6 +3681,7 @@
 
 	break;
 
+      case KEY_LEFT:
       case 'e' :				/* exit */
       case PF3 :
 	rv = config_exit_cmd(flags);
@@ -3749,6 +3753,7 @@
 
 	break;
 
+      case KEY_LEFT:
       case 'e' :				/* exit */
       case PF3 :
 	rv = config_exit_cmd(flags);
@@ -3775,6 +3780,7 @@
     struct variable *vtmp;
 
     switch(cmd){
+      case KEY_LEFT:
       case 'e':
       case PF3:
         retval = config_exit_cmd(flags);
@@ -3914,20 +3920,20 @@
 	    int maxwidth = min(80,ps->ttyo->screen_cols) - 15;
 
 	    if((*cl)->var->user_val.l && (*cl)->value){
-		strcpy(prompt, "Enter printer name : ");
+		strcpy(prompt, "JLW : ");
 	    }
 	    else if(!(*cl)->var->user_val.l && (*cl)->var->current_val.l){
 		/* Add to list which doesn't exist, but default does exist */
 		ekey[0].ch    = 'r';
 		ekey[0].rval  = 'r';
 		ekey[0].name  = "R";
-		ekey[0].label = "Replace";
+		ekey[0].label = "N";
 		ekey[1].ch    = 'a';
 		ekey[1].rval  = 'a';
 		ekey[1].name  = "A";
-		ekey[1].label = "Add To";
+		ekey[1].label = "[";
 		ekey[2].ch    = -1;
-		strcpy(prompt, "Replace or Add To default value ? ");
+		strcpy(prompt, "N(R)Υ[(A)w] ? ");
 		switch(i = radio_buttons(prompt, -FOOTER_ROWS(ps), ekey, 'a',
 					 'x', h_config_replace_add, RB_NORM)){
 		  case 'a':
@@ -3951,7 +3957,7 @@
 		    break;
 		    
 		  case 'x':
-		    q_status_message(SM_ORDER,0,3,"Add cancelled");
+		    q_status_message(SM_ORDER,0,3,"[Jʧ@");
 		    break;
 		}
 
@@ -3985,7 +3991,7 @@
 		    removing_trailing_white_space(name);
 		}
 		else if(i == 1){
-		    q_status_message(SM_ORDER,0,3,"Add cancelled");
+		    q_status_message(SM_ORDER,0,3,"[Jʧ@");
 		}
 		else if(i == 3){
 		    help = (help == NO_HELP) ? h_config_insert_after : NO_HELP;
@@ -4051,7 +4057,7 @@
 					 "Can't add %s to list", empty_val);
 		}
 		else if(i == 1){
-		    q_status_message(SM_ORDER,0,3,"Add cancelled");
+		    q_status_message(SM_ORDER,0,3,"[Jʧ@");
 		}
 		else if(i == 3){
 		    help = help == NO_HELP ? h_config_print_cmd : NO_HELP;
@@ -4076,7 +4082,7 @@
 	if(!(*cl)->var->user_val.l && (*cl)->var->current_val.l){
 	    char pmt[40];
 
-	    sprintf(pmt, "Override default with %s", empty_val2);
+	    sprintf(pmt, "Nw]ȥH %s \\L", empty_val2);
 	    if(want_to(pmt, 'n', 'n', NO_HELP, 0, 1) == 'y'){
 		char **ltmp;
 
@@ -4102,7 +4108,7 @@
 		fs_give((void **)&p);
 	    }
 	    else
-	      sprintf(prompt, "Really delete item %.20s from printer list ",
+	      sprintf(prompt, "TwۦCLCR %.20s ",
 		    int2string((*cl)->varmem + 1));
 
 	    ps->mangled_footer = 1;
@@ -4371,6 +4377,7 @@
 
 	break;
 
+      case KEY_LEFT:
       case 'e':					/* exit */
       case PF3:
 	rv = config_exit_cmd(flags);
@@ -5776,12 +5783,12 @@
 
 
 static struct key gripe_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{"^C","Cancel",KS_NONE},
+       {{"?","U",KS_SCREENHELP},	{"^C","",KS_NONE},
 	{NULL,NULL,KS_NONE},            {"S",NULL,KS_NONE},
-	{"P","Prev",KS_NONE},		{"N","Next",KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
+	{"P","e@",KS_NONE},		{"N","@",KS_NONE},
+	{"-","W@",KS_PREVPAGE},	{"Spc","U@",KS_NEXTPAGE},
 	{NULL,NULL,KS_NONE},	        {NULL,NULL,KS_NONE},
-	{NULL,NULL,KS_NONE},	        {"W","WhereIs",KS_WHEREIS}};
+	{NULL,NULL,KS_NONE},	        {"W","jM",KS_WHEREIS}};
 INST_KEY_MENU(gripe_keymenu, gripe_keys);
 #define SELECT_KEY 3
 
