head	1.8;
access;
symbols
	RELEASE_4_2_0:1.7
	RELEASE_4_1_1:1.7
	RELEASE_4_1_0:1.7
	RELEASE_3_5_0:1.7
	RELEASE_4_0_0:1.7
	RELEASE_3_4_0:1.6
	RELEASE_3_3_0:1.5
	RELEASE_3_2_0:1.5
	RELEASE_3_1_0:1.5
	RELEASE_2_2_8:1.5
	RELEASE_3_0_0:1.5
	RELEASE_2_2_7:1.2
	RELEASE_2_2_6:1.1;
locks; strict;
comment	@# @;


1.8
date	2000.11.17.19.06.53;	author keith;	state dead;
branches;
next	1.7;

1.7
date	99.12.27.00.58.50;	author steve;	state Exp;
branches;
next	1.6;

1.6
date	99.11.01.00.40.57;	author steve;	state Exp;
branches;
next	1.5;

1.5
date	98.10.10.04.29.25;	author steve;	state Exp;
branches;
next	1.4;

1.4
date	98.08.09.00.51.26;	author steve;	state Exp;
branches;
next	1.3;

1.3
date	98.07.30.12.30.39;	author vanilla;	state Exp;
branches;
next	1.2;

1.2
date	98.07.21.14.11.40;	author vanilla;	state Exp;
branches;
next	1.1;

1.1
date	98.02.02.14.34.38;	author vanilla;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Upgrade from 4.21 to 4.30.

Especially thanks to the maintainer, Tai-hwa Liang (avatar), for
ending those long lasting evil +400k files/patch-*. :-)

According to kkenn, pine4's security will exist until it's totally
rewritten, so I'll leave pkg-install untouched, which shows the
security warning.
PR:		ports/22436
@
text
@--- pine/newmail.c.orig	Tue Nov  2 08:13:10 1999
+++ pine/newmail.c	Fri Nov 19 16:18:24 1999
@@@@ -318,24 +318,15 @@@@
     ENVELOPE	*e;
     char	 subject[200], from[2*MAX_SCREEN_COLS],
 		 intro[MAX_SCREEN_COLS+1];
-    static char *carray[] = { "regarding",
-				"concerning",
-				"about",
-				"as to",
-				"as regards",
-				"as respects",
-				"in re",
-				"re",
-				"respecting",
-				"in point of",
-				"with regard to",
-				"subject:"
+    static char *carray[] = { "",
+				"",
+				"DG"
     };
 
     e = mail_fetchstructure(stream, max_num, NULL);
 
     if(e && e->from){
-	sprintf(from, " %srom ", (number > 1L) ? "Most recent f" : "F");
+	sprintf(from, " %srom ", (number > 1L) ? "̪" : "");
 	if(e->from->personal)
 	  istrncpy(from + ((number > 1L) ? 18 : 6),
 		   (char *) rfc1522_decode((unsigned char *) tmp_20k_buf,
@@@@ -352,13 +343,13 @@@@
 
     if(number <= 1L) {
         if(e && e->subject){
-	    sprintf(subject, " %s ", carray[(unsigned)random()%12]);
+	    sprintf(subject, " %s ", carray[(unsigned)random()%2]);
 	    istrncpy(subject + strlen(subject),
 		     (char *) rfc1522_decode((unsigned char *) tmp_20k_buf,
 					     e->subject, NULL), 100);
 	}
 	else
-	  strcpy(subject, " with no subject");
+	  strcpy(subject, " SDD");
 
         if(!from[0])
           subject[1] = toupper((unsigned char)subject[1]);
@@@@ -368,29 +359,29 @@@@
 
     if(!folder) {
         if(number > 1)
-          sprintf(intro, "%ld new messages!", number);
+          sprintf(intro, "%ld ʷsHI", number);
         else
-	  sprintf(intro, "New mail%s!",
-		  (e && address_is_us(e->to, ps_global)) ? " to you" : "");
+	  sprintf(intro, "%ssHI",
+		  (e && address_is_us(e->to, ps_global)) ? "z" : "");
     }
     else {
 	long fl, tot, newfl;
 
 	if(number > 1)
-	  sprintf(intro, "%ld messages saved to folder \"%s\"", number,
+	  sprintf(intro, "%ld ʫHQsܸƧX \"%s\"", number,
 		  folder);
 	else
-	  sprintf(intro, "Mail saved to folder \"%s\"", folder);
+	  sprintf(intro, "HQsܸƧX \"%s\"", folder);
 	
 	if((fl=strlen(folder)) > 10 &&
 	   (tot=strlen(intro) + strlen(from) + strlen(subject)) >
 					   ps_global->ttyo->screen_cols - 2){
 	    newfl = max(10, fl-(tot-(ps_global->ttyo->screen_cols - 2)));
 	    if(number > 1)
-	      sprintf(intro, "%ld messages saved to folder \"...%s\"", number,
+	      sprintf(intro, "%ld ʫHQsܸƧX \"...%s\"", number,
 		      folder+(fl-(newfl-3)));
 	    else
-	      sprintf(intro, "Mail saved to folder \"...%s\"",
+	      sprintf(intro, "HQsܸƧX \"...%s\"",
 		      folder+(fl-(newfl-3)));
 	}
     }
@


1.7
log
@Update to version 4.21.

PR:		14994
Submitted by:	maintainer
@
text
@@


1.6
log
@Update to version 4.20.

PR:		14575
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/newmail.c.orig	Sat Oct  9 00:46:59 1999
+++ pine/newmail.c	Thu Oct 14 12:19:31 1999
@@@@ -314,24 +314,15 @@@@
d32 1
a32 1
@@@@ -348,13 +339,13 @@@@
d48 1
a48 1
@@@@ -364,29 +355,29 @@@@
@


1.5
log
@Update to version 4.05.

PR:		8025
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/newmail.c.orig	Sat Aug 22 10:33:02 1998
+++ pine/newmail.c	Tue Sep 22 19:22:59 1998
@@@@ -301,38 +301,28 @@@@
d20 2
a21 1
+				""
a25 19
     if(!folder) {
         if(number > 1)
-          sprintf(intro, "%ld new messages!", number);
+          sprintf(intro, "%ld ʷsHI", number);
         else
-	  sprintf(intro, "New mail%s!",
-		  (e && address_is_us(e->to, ps_global)) ? " to you" : "");
+	  sprintf(intro, "%ssHI",
+		  (e && address_is_us(e->to, ps_global)) ? "z" : "");
     }
     else {
         if(number > 1)
-          sprintf(intro,"%ld messages saved to folder \"%s\"", number, folder);
+          sprintf(intro,"%ld ʫHQsܸƧX \"%s\"", number, folder);
         else
-          sprintf(intro, "Mail saved to folder \"%s\"", folder);
+          sprintf(intro, "HQsܸƧX \"%s\"", folder);
     }
 
d28 1
a28 1
+	sprintf(from, "%s", (number > 1L) ? "̪" : "");
d32 1
a32 1
@@@@ -349,13 +339,13 @@@@
d48 37
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/newmail.c.orig	Fri Mar 27 07:28:33 1998
+++ pine/newmail.c	Tue Aug  4 12:42:19 1998
@@@@ -289,38 +289,28 @@@@
d50 1
a50 1
@@@@ -337,13 +327,13 @@@@
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 33
a33 175
--- pine/pine.c.orig	Wed Jul 22 06:02:36 1998
+++ pine/pine.c	Tue Jul 28 08:35:06 1998
@@@@ -107,12 +107,12 @@@@
 	OTHER_MENU,
 	NULL_MENU,
 	NULL_MENU,
-	{"P","PrevCmd",{MC_PREVITEM,3,{'p',ctrl('P'),KEY_UP}},KS_NONE},
-	{"N","NextCmd",{MC_NEXTITEM,3,{'n',ctrl('N'),KEY_DOWN}},KS_NONE},
+	{"P","e@@RO",{MC_PREVITEM,3,{'p',ctrl('P'),KEY_UP}},KS_NONE},
+	{"N","@@RO",{MC_NEXTITEM,3,{'n',ctrl('N'),KEY_DOWN}},KS_NONE},
 	NULL_MENU,
 	NULL_MENU,
-	{"R","RelNotes",{MC_RELNOTES,1,{'r'}},KS_NONE},
-	{"K","KBLock",{MC_KBLOCK,1,{'k'}},KS_NONE},
+	{"R","X",{MC_RELNOTES,1,{'r'}},KS_NONE},
+	{"K","Lw",{MC_KBLOCK,1,{'k'}},KS_NONE},
 	NULL_MENU,
 	NULL_MENU,
 
@@@@ -122,10 +122,10 @@@@
 	COMPOSE_MENU,
 	LISTFLD_MENU,
 	GOTO_MENU,
-	{"I","Index",{MC_INDEX,1,{'i'}},KS_FLDRINDEX},
-	{"J","Journal",{MC_JOURNAL,1,{'j'}},KS_REVIEW},
-	{"S","Setup",{MC_SETUP,1,{'s'}},KS_NONE},
-	{"A","AddrBook",{MC_ADDRBOOK,1,{'a'}},KS_ADDRBOOK},
+	{"I","",{MC_INDEX,1,{'i'}},KS_FLDRINDEX},
+	{"J","x",{MC_JOURNAL,1,{'j'}},KS_REVIEW},
+	{"S","]w",{MC_SETUP,1,{'s'}},KS_NONE},
+	{"A","a}ï",{MC_ADDRBOOK,1,{'a'}},KS_ADDRBOOK},
 	NULL_MENU,
 	NULL_MENU};
 INST_KEY_MENU(main_keymenu, main_keys);
@@@@ -511,7 +511,7 @@@@
 		static struct key simple_file_keys[] =
 		{HELP_MENU,
 		 NULL_MENU,
-		 {"Q","Quit Viewer",{MC_EXIT,1,{'q'}},KS_NONE},
+		 {"Q","}",{MC_EXIT,1,{'q'}},KS_NONE},
 		 NULL_MENU,
 		 NULL_MENU,
 		 NULL_MENU,
@@@@ -520,15 +520,15 @@@@
 		 PRYNTTXT_MENU,
 		 WHEREIS_MENU,
 		 FWDEMAIL_MENU,
-		 {"S", "Save", {MC_SAVETEXT,1,{'s'}}, KS_SAVE}};
+		 {"S", "s", {MC_SAVETEXT,1,{'s'}}, KS_SAVE}};
 		INST_KEY_MENU(simple_file_keymenu, simple_file_keys);
 #define SAVE_KEY 9
 
 		memset(&sargs, 0, sizeof(SCROLL_S));
 		sargs.text.text = so_text(store);
 		sargs.text.src  = src;
-		sargs.text.desc = "file";
-		sargs.bar.title = "FILE VIEW";
+		sargs.text.desc = "ɮ";
+		sargs.bar.title = "˵ɮ";
 		sargs.bar.style = FileTextPercent;
 		sargs.keys.menu = &simple_file_keymenu;
 		setbitmap(sargs.keys.bitmap);
@@@@ -709,7 +709,7 @@@@
 	    if(!pine_state->VAR_INBOX_PATH || !pine_state->VAR_INBOX_PATH[0]
 	       || strucmp(pine_state->VAR_INBOX_PATH, "inbox") == 0){
 		HelpType help = NO_HELP;
-		static   ESCKEY_S ekey[] = {{ctrl(T), 2, "^T", "To Fldrs"},
+		static   ESCKEY_S ekey[] = {{ctrl(T), 2, "^T", "ƧX"},
 					  {-1, 0, NULL, NULL}};
 
 		pine_state->mangled_footer = 1;
@@@@ -719,7 +719,7 @@@@
 
         	    rv = optionally_enter(int_mail, -FOOTER_ROWS(pine_state),
 				      0, MAXPATH,
-				      "No inbox!  Folder to open as inbox : ",
+				      "SsiHX(inbox)IHX}Ҭ inboxG",
 				      /* ekey */ NULL, help, &flags);
         	    if(rv == 3){
 			help = (help == NO_HELP) ? h_sticky_inbox : NO_HELP;
@@@@ -731,7 +731,7 @@@@
     		}
 
     		if(rv == 1){
-		    q_status_message(SM_ORDER, 0, 2 ,"Folder open cancelled");
+		    q_status_message(SM_ORDER, 0, 2 ,"}ҫHX");
 		    rv = 0;		/* reset rv */
 		} 
 		else if(rv == 2){
@@@@ -750,7 +750,7 @@@@
 		    removing_leading_white_space(int_mail);
 		    if((!pine_state->VAR_INBOX_PATH 
 			|| strucmp(pine_state->VAR_INBOX_PATH, "inbox") == 0)
-		     && want_to("Preserve folder as \"inbox-path\" in PINERC", 
+		     && want_to("b PINERC OdƧX \"inbox-path\"", 
 				'y', 'n', NO_HELP, WT_NORM) == 'y'){
 			set_variable(V_INBOX_PATH, int_mail, 1);
 		    }
@@@@ -895,25 +895,25 @@@@
 		 *news_addition;
     int		  key_index;	  /* index into keymenu array for this cmd */
 } mkeys[] = {
-    {" %s     HELP               -  Get help using Pine",
+    {" %s     ϥλ           -  Pine ϥλ",
      NULL, MAIN_HELP_KEY},
     {"", NULL, UNUSED},
-    {" %s     COMPOSE MESSAGE    -  Compose and send%s a message",
+    {" %s     gH               -  gHάOo峹",
      "/post", MAIN_COMPOSE_KEY},
     {"", NULL, UNUSED},
-    {" %s     MESSAGE INDEX      -  View messages in current folder",
+    {" %s     dݫHX         -  dݥثeHXH",
      NULL, MAIN_INDEX_KEY},
     {"", NULL, UNUSED},
-    {" %s     FOLDER LIST        -  Select a folder%s to view",
-     " OR news group", MAIN_FOLDER_KEY},
+    {" %s     HXC         -  CXHX%sHѿ",
+     "άOsDոs", MAIN_FOLDER_KEY},
     {"", NULL, UNUSED},
-    {" %s     ADDRESS BOOK       -  Update address book",
+    {" %s     a}ï             -  sέקa}ïe",
      NULL, MAIN_ADDRESS_KEY},
     {"", NULL, UNUSED},
-    {" %s     SETUP              -  Configure Pine Options",
+    {" %s     ]w               -  ]w Pine Ѽ",
      NULL, MAIN_SETUP_KEY},
     {"", NULL, UNUSED},
-    {" %s     QUIT               -  Leave the Pine program",
+    {" %s     }               -   Pine ϥ",
      NULL, MAIN_QUIT_KEY}
 };
 
@@@@ -1206,7 +1206,7 @@@@
 		pine_state->mangled_footer = 1;
 	    }
 	    else{
-		helper(main_menu_tx, "HELP FOR MAIN MENU", 0);
+		helper(main_menu_tx, "D檺U", 0);
 		pine_state->mangled_screen = 1;
 	    }
 
@@@@ -1234,7 +1234,7 @@@@
 		just_a_navigate_cmd++;
 	    }
 	    else
-	      q_status_message(SM_ORDER, 0, 2, "Already at top of list");
+	      q_status_message(SM_ORDER, 0, 2, "wgbCݤF");
 
 	    break;
 
@@@@ -1250,14 +1250,14 @@@@
 		just_a_navigate_cmd++;
 	    }
 	    else
-	      q_status_message(SM_ORDER, 0, 2, "Already at bottom of list");
+	      q_status_message(SM_ORDER, 0, 2, "wgbCݤF");
 
 	    break;
 
 
 	    /*---------- Release Notes ----------*/
 	  case MC_RELNOTES :
-	    helper(h_news, "PINE RELEASE NOTES", 0);
+	    helper(h_news, "PINE XKn", 0);
 	    pine_state->mangled_screen = 1;
 	    break;
 
@@@@ -1486,7 +1486,7 @@@@
 
     /* paint the titlebar if needed */
     if(ps->mangled_header){
-	set_titlebar("MAIN MENU", ps->mail_stream, ps->context_current,
+	set_titlebar("D", ps->mail_stream, ps->context_current,
 		     ps->cur_folder, ps->msgmap, 1, FolderName, 0, 0);
 	ps->mangled_header = 0;
d35 7
a41 36
@@@@ -1651,13 +1651,13 @@@@
 {
     char        prompt[80];
     char        letters[20];
-    char        *printer  = "Printer";
-    char        *passwd   = "Newpassword";
-    char        *config   = "Config";
-    char        *update   = "Update";
-    char	*sigedit  = "Signature";
-    char	*abooks   = "AddressBooks";
-    char	*clctns   = "collectionList";
+    char        *printer  = "L";
+    char        *passwd   = "]wsKX";
+    char        *config   = "ҳ]w";
+    char        *update   = "s";
+    char	*sigedit  = "sñW";
+    char	*abooks   = "a}ï";
+    char	*clctns   = "`C";
 #ifdef	ENABLE_LDAP
     char	*dir      = "Directory";
 #endif
@@@@ -1735,13 +1735,13 @@@@
     }
 
     sprintf(prompt,
-	    "Choose a setup task from %s : ",
-	    F_ON(F_BLANK_KEYMENU,ps_global) ? letters : "the menu below");
+	    "бq%sܧAҭn]wu@@G",
+	    F_ON(F_BLANK_KEYMENU,ps_global) ? letters : "UC椤");
 
     s = radio_buttons(prompt, ql, setup_names, deefault, 'x', help, RB_NORM);
     /* ^C */
     if(s == 'x') {
-	q_status_message(SM_ORDER,0,3,"Setup command cancelled");
+	q_status_message(SM_ORDER,0,3,"]wO");
 	s = 'e';
d44 19
a62 56
@@@@ -1854,14 +1854,14 @@@@
     HELP_MENU,
     NULL_MENU,
     {"E",NULL,{MC_EXIT,1,{'e',ctrl('M'),ctrl('J')}},KS_NONE},
-    {"Ret","[Be Counted!]",{MC_VIEW_HANDLE,2,{ctrl('M'),ctrl('J')}},KS_NONE},
+    {"Ret","[CJϥΪ`p]",{MC_VIEW_HANDLE,2,{ctrl('M'),ctrl('J')}},KS_NONE},
     NULL_MENU,
     NULL_MENU,
     PREVPAGE_MENU,
     NEXTPAGE_MENU,
     PRYNTMSG_MENU,
     NULL_MENU,
-    {"R","RelNotes",{MC_RELNOTES,1,{'r'}},KS_NONE},
+    {"R","X",{MC_RELNOTES,1,{'r'}},KS_NONE},
     NULL_MENU};
 INST_KEY_MENU(nuov_keymenu, nuov_keys);
 #define	NUOV_EXIT	2
@@@@ -1950,13 +1950,13 @@@@
 		memset(&sargs, 0, sizeof(SCROLL_S));
 		sargs.text.text	   = so_text(store);
 		sargs.text.src	   = CharStar;
-		sargs.text.desc	   = "greeting text";
+		sargs.text.desc	   = "ݭԤr";
 		sargs.text.handles = handles;
-		sargs.bar.title	   = "GREETING TEXT";
+		sargs.bar.title	   = "ݭԤr";
 		sargs.bar.style	   = TextPercent;
 		sargs.proc.tool	   = nuov_processor;
 		sargs.help.text	   = main_menu_tx;
-		sargs.help.title   = "MAIN PINE HELP";
+		sargs.help.title   = "PINE DnU";
 		sargs.resize_exit  = 1;
 		sargs.force_h	   = 1;
 		sargs.keys.menu	   = &km;
@@@@ -1967,11 +1967,11 @@@@
 		setbitmap(sargs.keys.bitmap);
 
 		if(ps->phone_home){
-		    km.keys[NUOV_EXIT].label = "Exit this greeting";
+		    km.keys[NUOV_EXIT].label = "}";
 		    km.keys[NUOV_EXIT].bind.nch = 1;
 		}
 		else{
-		    km.keys[NUOV_EXIT].label	= "[Exit this greeting]";
+		    km.keys[NUOV_EXIT].label	= "[}]";
 		    km.keys[NUOV_EXIT].bind.nch = 3;
 		    clrbitn(NUOV_VIEW, sargs.keys.bitmap);
 		}
@@@@ -2029,7 +2029,7 @@@@
 	break;
 
       case MC_RELNOTES :
-	helper(h_news, "PINE RELEASE NOTES", 0);
+	helper(h_news, "PINE XKn", 0);
 	ps_global->mangled_screen = 1;
 	break;
d64 2
a65 9
@@@@ -2148,7 +2148,7 @@@@
     dprint(1, (debugfile, "\n\n    ---- QUIT SCREEN ----\n"));    
 
     if(!pine_state->nr_mode && F_OFF(F_QUIT_WO_CONFIRM,pine_state)
-       && want_to("Really quit pine", 'y', 0, NO_HELP, WT_NORM) != 'y') {
+       && want_to("un} Pine ܡH", 'y', 0, NO_HELP, WT_NORM) != 'y') {
         pine_state->next_screen = pine_state->prev_screen;
         return;
     }
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 175
a175 9
--- pine/signals.c.orig	Tue Jul  7 07:42:45 1998
+++ pine/signals.c	Wed Jul 15 17:02:38 1998
@@@@ -386,7 +386,7 @@@@
 	ps_global->inbox_stream->rdonly = 1;	/* and become read-only */
 	mail_ping(ps_global->inbox_stream);
 	q_status_message(SM_ASYNC, 3, 7,
-		   "Another Pine is accessing Inbox.  Session now Read-Only.");
+		   "t~@@ Pine bs InboxCo session iJŪAC");
 	dprint(1, (debugfile, "** INBOX went read-only **\n\n"));
d177 29
d207 6
a212 7
@@@@ -398,7 +398,7 @@@@
 	ps_global->mail_stream->rdonly = 1;	/* and become read-only */
 	mail_ping(ps_global->mail_stream);
 	q_status_message(SM_ASYNC, 3, 7,
-		  "Another Pine is accessing folder.  Session now Read-Only.");
+		  "t~@@ Pine bsƧXCo session iJŪAC");
 	dprint(1, (debugfile, "** secondary folder went read-only **\n\n"));
a213 18
 }
@@@@ -536,7 +536,7 @@@@
     int retval = 1;
 
     dprint(9,(debugfile, "busy_alarm(%d, %s, %p, %d)\n",
-	seconds, msg ? msg : "Busy", pc_func, init_msg));
+	seconds, msg ? msg : "еy", pc_func, init_msg));
 
     /*
      * If we're already busy'ing, and we don't have something special,
@@@@ -560,7 +560,7 @@@@
 	    final_message = 1;
 	}
 	else{
-	    strcpy(busy_message, "Busy");
+	    strcpy(busy_message, "еy");
 	    final_message = 0;
 	}
d215 66
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@d1 10
a10 4
--- 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];
d12 20
a31 34
 	    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;
d33 4
a36 4
 	else if(rv == 'x'){			/* Cancelled! */
-	    rstr = "Exit Cancelled";
+	    rstr = "";
 	    break;
a37 349
     }
@@@@ -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
@
