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.49;	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.24;	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.37;	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/mailindx.c.orig	Tue Nov  9 08:20:33 1999
+++ pine/mailindx.c	Fri Nov 19 16:18:24 1999
@@@@ -55,10 +55,10 @@@@
 /*
  * Some common Command Bindings
  */
-#define	VIEWMSG_MENU	{">", "[ViewMsg]", \
+#define	VIEWMSG_MENU	{">", "[˵H]", \
 			 {MC_VIEW_TEXT, 5,{'v','.','>',ctrl('M'),ctrl('J')}}, \
 			 KS_VIEW}
-#define	FLDRSORT_MENU	{"$", "SortIndex", {MC_SORT,1,{'$'}}, KS_SORT}
+#define	FLDRSORT_MENU	{"$", "Ƨǯ", {MC_SORT,1,{'$'}}, KS_SORT}
 
 
 /*
@@@@ -67,7 +67,7 @@@@
 static struct key index_keys[] = 
        {HELP_MENU,
 	OTHER_MENU,
-	{"<", "FldrList", {MC_FOLDERS,2,{'<',','}}, KS_NONE},
+	{"<", "HXC", {MC_FOLDERS,2,{'<',','}}, KS_NONE},
 	VIEWMSG_MENU,
 	PREVMSG_MENU,
 	NEXTMSG_MENU,
@@@@ -94,9 +94,9 @@@@
 	HELP_MENU,
 	OTHER_MENU,
 	{"X",NULL,{MC_EXPUNGE,1,{'x'}},KS_NONE},
-	{"&","unXclude",{MC_UNEXCLUDE,1,{'&'}},KS_NONE},
-	{";","Select",{MC_SELECT,1,{';'}},KS_SELECT},
-	{"A","Apply",{MC_APPLY,1,{'a'}},KS_APPLY},
+	{"&","ư(exclude)",{MC_UNEXCLUDE,1,{'&'}},KS_NONE},
+	{";","",{MC_SELECT,1,{';'}},KS_SELECT},
+	{"A","M",{MC_APPLY,1,{'a'}},KS_APPLY},
 	FLDRSORT_MENU,
 	JUMP_MENU,
 	HDRMODE_MENU,
@@@@ -106,8 +106,8 @@@@
 
 	HELP_MENU,
 	OTHER_MENU,
-	{":","SelectCur",{MC_SELCUR,1,{':'}},KS_SELECTCUR},
-	{"Z","ZoomMode",{MC_ZOOM,1,{'z'}},KS_ZOOM},
+	{":","",{MC_SELCUR,1,{':'}},KS_SELECTCUR},
+	{"Z","YҦ",{MC_ZOOM,1,{'z'}},KS_ZOOM},
 	LISTFLD_MENU,
 	RCOMPOSE_MENU,
 	NULL_MENU,
@@@@ -175,9 +175,9 @@@@
   
 static struct key simple_index_keys[] = 
        {HELP_MENU,
-	{"E","ExitSelect",{MC_EXIT,1,{'e'}},KS_EXITMODE},
+	{"E","}",{MC_EXIT,1,{'e'}},KS_EXITMODE},
 	NULL_MENU,
-	{"S","[Select]",{MC_SELECT,3,{'s',ctrl('M'),ctrl('J')}},KS_SELECT},
+	{"S","[]",{MC_SELECT,3,{'s',ctrl('M'),ctrl('J')}},KS_SELECT},
 	PREVMSG_MENU,
 	NEXTMSG_MENU,
 	PREVPAGE_MENU,
@@@@ -388,14 +388,14 @@@@
     if(flags & INDX_HEADER)
       set_titlebar((stream == ps_global->mail_stream)
 		     ? (style == MsgIndex || style == MultiMsgIndex)
-		         ? "MESSAGE INDEX"
-			 : "ZOOMED MESSAGE INDEX"
+		         ? "H"
+			 : "Y᪺H"
 		     : (!strcmp(folder, INTERRUPTED_MAIL))
-			 ? "COMPOSE: SELECT INTERRUPTED"
+			 ? "sGܳQ_"
 			 : (ps_global->VAR_FORM_FOLDER
 			    && !strcmp(ps_global->VAR_FORM_FOLDER, folder))
-			     ? "COMPOSE: SELECT FORM LETTER"
-			     : "COMPOSE: SELECT POSTPONED",
+			     ? "sGܼ˪H"
+			     : "sGܳQȽw",
 		   stream, cntxt, folder, msgmap, 1, MessageNumber, 0, 0);
 
     if(flags & INDX_FOOTER) {
@@@@ -487,7 +487,7 @@@@
 {
     dprint(1, (debugfile, "\n\n ---- MAIL INDEX ----\n"));
     if(!state->mail_stream) {
-	q_status_message(SM_ORDER, 0, 3, "No folder is currently open");
+	q_status_message(SM_ORDER, 0, 3, "ثe|Lw}ҪHX");
         state->prev_screen = mail_index_screen;
 	state->next_screen = main_menu_screen;
 	return;
@@@@ -695,7 +695,7 @@@@
 	if(F_ON(F_SHOW_CURSOR, state) && cur_row < 0){
 	    q_status_message(SM_ORDER,
 		(ch==NO_OP_IDLE || ch==NO_OP_COMMAND) ? 0 : 3, 5,
-		"No messages in folder");
+		"HXSH");
 	    cur_row = state->ttyo->screen_rows - FOOTER_ROWS(state);
 	    display_message(ch);
 	}
@@@@ -822,7 +822,7 @@@@
 		    k = i;
 		    if(++j >= id.lines_per_page){
 			if((id.msg_at_top = i) == 1L)
-			  q_status_message(SM_ORDER, 0, 1, "First Index page");
+			  q_status_message(SM_ORDER, 0, 1, "޲Ĥ@@");
 
 			break;
 		    }
@@@@ -831,7 +831,7 @@@@
 		if(i <= 1L){
 		    if(mn_get_cur(msgmap) == 1L)
 		      q_status_message(SM_ORDER, 0, 1,
-			  "Already at start of Index");
+			  "wgbު_YF");
 
 		    break;
 		}
@@@@ -851,7 +851,7 @@@@
 		    k = i;
 		    if(++j >= id.lines_per_page){
 			if(i+id.lines_per_page >= mn_get_total(msgmap))
-			  q_status_message(SM_ORDER, 0, 1, "Last Index page");
+			  q_status_message(SM_ORDER, 0, 1, "޳̲׭");
 
 			id.msg_at_top = i;
 			break;
@@@@ -860,7 +860,7 @@@@
 
 		if(i >= mn_get_total(msgmap)){
 		    if(mn_get_cur(msgmap) == k)
-		      q_status_message(SM_ORDER,0,1,"Already at end of Index");
+		      q_status_message(SM_ORDER,0,1,"wgbުF");
 
 		    break;
 		}
@@@@ -1079,9 +1079,9 @@@@
 			}
 
 			q_status_message2(SM_ORDER, 0, 1,
-					  "Message %s %sdeleted",
+					  "H %s %sR",
 					  long2string(mn_get_cur(msgmap)),
-					  (del) ? "" : "already ");
+					  (del) ? "" : "w");
 		    }
 
 		    break;
@@@@ -1103,9 +1103,9 @@@@
 			}
 
 			q_status_message2(SM_ORDER, 0, 1,
-					  "Message %s %sdeleted",
+					  "H %s %sR",
 					  long2string(mn_get_cur(msgmap)),
-					  (del) ? "UN" : "NOT ");
+					  (del) ? "wD_" : "Q");
 		    }
 
 		    break;
@@@@ -2176,7 +2176,7 @@@@
 	    dprint(1, (debugfile,
 		       "parse_index_format: unrecognized token: %s\n", q));
 	    q_status_message1(SM_ORDER | SM_DING, 0, 3,
-			      "Unrecognized string in index-format: %s", q);
+			      "ޮ榡X{LkѪrG%s", q);
 	    continue;
 	}
 
@@@@ -2218,7 +2218,7 @@@@
     if(!column){
 	dprint(1, (debugfile, "Completely unrecognizable index-format\n"));
 	q_status_message(SM_ORDER | SM_DING, 0, 3,
-		 "Configured \"index-format\" unrecognizable. Using default.");
+		 "LkѤw]w \"index-format\"Cϥιw]ȡC");
 	return(0);
     }
 
@@@@ -3130,7 +3130,7 @@@@
 		sprintf(str, "%ld", idata->msgno);
 	      else if(idata->bogus < 2 && cdesc->ctype == iSubject)
 		sprintf(str, "%-*.*s", width, width,
-			"[ No Message Text Available ]");
+			"[ LkoH ]");
 	  }
 	  else
 	    switch(cdesc->ctype){
@@@@ -4824,8 +4824,8 @@@@
     HelpType	help;
     static char search_string[MAX_SEARCH+1] = { '\0' };
     static ESCKEY_S header_search_key[] = { {0, 0, NULL, NULL },
-					    {ctrl('Y'), 10, "^Y", "First Msg"},
-					    {ctrl('V'), 11, "^V", "Last Msg"},
+					    {ctrl('Y'), 10, "^Y", "Ĥ@@ʫH"},
+					    {ctrl('V'), 11, "^V", "̫@@ʫH"},
 					    {-1, 0, NULL, NULL} };
 
     dprint(4, (debugfile, "\n - search headers - \n"));
@@@@ -4834,7 +4834,7 @@@@
 	return;
     }
     else if(mn_total_cur(msgmap) > 1L){
-	q_status_message1(SM_ORDER, 0, 2, "%s msgs selected; Can't search",
+	q_status_message1(SM_ORDER, 0, 2, "w %s ʫHFLkjM",
 			  comatose(mn_total_cur(msgmap)));
 	return;
     }
@@@@ -4845,13 +4845,13 @@@@
     new_string[0] = '\0';
 
     while(1) {
-	sprintf(prompt, "Word to search for [%s] : ", search_string);
+	sprintf(prompt, "jM[%s]G", search_string);
 
 	if(F_ON(F_ENABLE_AGG_OPS, ps_global)){
 	    header_search_key[0].ch    = ctrl('X');
 	    header_search_key[0].rval  = 12;
 	    header_search_key[0].name  = "^X";
-	    header_search_key[0].label = "Select Matches";
+	    header_search_key[0].label = "ŦX";
 	}
 	else{
 	    header_search_key[0].ch   = header_search_key[0].rval  = 0;
@@@@ -4870,7 +4870,7 @@@@
             continue;
         }
 	else if(rc == 10){
-	    q_status_message(SM_ORDER, 0, 3, "Searched to First Message.");
+	    q_status_message(SM_ORDER, 0, 3, "jMܲĤ@@ʫHC");
 	    if(any_lflagged(msgmap, MN_HIDE)){
 		do{
 		    selected = sorted_msg;
@@@@ -4886,7 +4886,7 @@@@
 	    return;
 	}
 	else if(rc == 11){
-	    q_status_message(SM_ORDER, 0, 3, "Searched to Last Message.");
+	    q_status_message(SM_ORDER, 0, 3, "jM̫ܳ@@ʫHC");
 	    if(any_lflagged(msgmap, MN_HIDE)){
 		do{
 		    selected = sorted_msg;
@@@@ -4911,7 +4911,7 @@@@
     }
 
     if(rc == 1 || (new_string[0] == '\0' && search_string[0] == '\0')) {
-	cmd_cancelled("Search");
+	cmd_cancelled("jM");
         return;
     }
 
@@@@ -4950,21 +4950,21 @@@@
 	}
 
     if(ps_global->intr_pending){
-	q_status_message1(SM_ORDER, 0, 3, "Search cancelled.%s",
+	q_status_message1(SM_ORDER, 0, 3, "jMC%s",
 			  select_all ? " Selected set may be incomplete.":"");
     }
     else if(select_all){
-	q_status_message1(SM_ORDER, 0, 3, "%s messages found matching word",
+	q_status_message1(SM_ORDER, 0, 3, "@@ %s ʫHŦXr",
 			  long2string(selected));
     }
     else if(selected){
-	q_status_message1(SM_ORDER, 0, 3, "Word found%s",
+	q_status_message1(SM_ORDER, 0, 3, "rw%s",
 			  (i <= sorted_msg)
-			    ? ". Search wrapped to beginning" : "");
+			    ? "CYjM" : "");
 	mn_set_cur(msgmap, i);
     }
     else
-      q_status_message(SM_ORDER, 0, 3, "Word not found");
+      q_status_message(SM_ORDER, 0, 3, "䤣r");
 
 #ifndef	DOS
     intr_handling_off();
@@@@ -5224,7 +5224,7 @@@@
 		 && LEVELSORT(ps_global->mail_stream)))
 	      sort_func = percent_sorted;
 
-	    sprintf(sort_msg, "Sorting \"%s\"",
+	    sprintf(sort_msg, "bƧ \"%s\"",
 		    strsquish(tmp_20k_buf + 500, ps_global->cur_folder,
 			      ps_global->ttyo->screen_cols - 20));
 	    we_cancel = busy_alarm(1, sort_msg, sort_func, 1);
@@@@ -5310,9 +5310,9 @@@@
 		new_sort = mn_get_sort(msgmap);
 		new_rev  = mn_get_revsort(msgmap);
 		q_status_message2(SM_ORDER, 3, 3,
-				  "Sort %s!  Restored %s sort.",
+				  "Ƨ%sI^_ %s ƧǡC",
 				  ps_global->intr_pending
-				    ? "Canceled" : "Failed",
+				    ? "w" : "",
 				  sort_name(new_sort));
 	    }
 
@@@@ -6135,7 +6135,7 @@@@
 	      icache.name = temp_nam(NULL, "pi");
 
 	    if((icache.cache = (void *)fopen(icache.name,"w+b")) == NULL){
-		sprintf(tmp_20k_buf, "Can't open index cache: %s",icache.name);
+		sprintf(tmp_20k_buf, "Lk}үާ֨G%s",icache.name);
 		fatal(tmp_20k_buf);
 	    }
 
@@@@ -6531,10 +6531,10 @@@@
 	   && format_message(mn_m2raw(ps_global->msgmap,
 				      mn_get_cur(ps_global->msgmap)),
 			     env, body, FM_NEW_MESS, pc)){
-	    sprintf(title, "Folder %s  --  Message %ld of %ld",
+	    sprintf(title, "HX %s  --  %ld ʫH󤤪 %ld ",
 		    strsquish(tmp_20k_buf + 500, ps_global->cur_folder, 50),
-		    mn_get_cur(ps_global->msgmap),
-		    mn_get_total(ps_global->msgmap));
+		    mn_get_total(ps_global->msgmap),
+		    mn_get_cur(ps_global->msgmap));
 	    *text  = so_text(so);
 	    *l     = strlen((char *)so_text(so));
 	    *style = GETTEXT_TEXT;
@


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 2
a2 2
--- pine/mailindx.c.orig	Fri Oct  1 03:44:27 1999
+++ pine/mailindx.c	Thu Oct 14 12:26:44 1999
d297 1
a297 1
@@@@ -6127,7 +6127,7 @@@@
d306 1
a306 1
@@@@ -6523,10 +6523,10 @@@@
@


1.5
log
@Update to version 4.05.

PR:		8025
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pine/mailindx.c.orig	Thu Sep  3 00:22:21 1998
+++ pine/mailindx.c	Tue Sep 22 19:18:33 1998
d47 1
a47 1
 	NULL_MENU,
d61 1
a61 1
@@@@ -356,14 +356,14 @@@@
d81 1
a81 1
@@@@ -455,7 +455,7 @@@@
d90 1
a90 1
@@@@ -657,7 +657,7 @@@@
d99 1
a99 1
@@@@ -778,7 +778,7 @@@@
d108 1
a108 1
@@@@ -787,7 +787,7 @@@@
d117 1
a117 1
@@@@ -807,7 +807,7 @@@@
d126 1
a126 1
@@@@ -816,7 +816,7 @@@@
d135 1
a135 1
@@@@ -1029,9 +1029,9 @@@@
d147 1
a147 1
@@@@ -1053,9 +1053,9 @@@@
d159 1
a159 1
@@@@ -1861,7 +1861,7 @@@@
d168 1
a168 1
@@@@ -1903,7 +1903,7 @@@@
d177 1
a177 1
@@@@ -2526,7 +2526,7 @@@@
d186 1
a186 1
@@@@ -3425,8 +3425,8 @@@@
d197 1
a197 1
@@@@ -3435,7 +3435,7 @@@@
d206 1
a206 1
@@@@ -3446,13 +3446,13 @@@@
d222 1
a222 1
@@@@ -3471,7 +3471,7 @@@@
d231 1
a231 1
@@@@ -3487,7 +3487,7 @@@@
d240 1
a240 1
@@@@ -3512,7 +3512,7 @@@@
d249 1
a249 1
@@@@ -3551,21 +3551,21 @@@@
d276 1
a276 1
@@@@ -3702,7 +3702,7 @@@@
d285 1
a285 1
@@@@ -3752,8 +3752,8 @@@@
a289 1
-				  g_sort_prog->abort ? "Canceled" : "Failed",
d291 3
a293 1
+				  g_sort_prog->abort ? "w" : "",
d296 2
a297 2
 	    else if(mn_get_total(msgmap) < g_sort_prog->nmsgs)
@@@@ -4515,7 +4515,7 @@@@
d306 1
a306 1
@@@@ -4897,10 +4897,10 @@@@
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pine/mailindx.c.orig	Tue Jul 21 01:21:48 1998
+++ pine/mailindx.c	Tue Aug  4 12:42:18 1998
d43 1
a43 1
-	{"Z","ZoomMode",{MC_ZOOM,1,{'z'}},KS_NONE},
d45 1
a45 1
+	{"Z","YҦ",{MC_ZOOM,1,{'z'}},KS_NONE},
d61 1
a61 1
@@@@ -344,14 +344,14 @@@@
d81 1
a81 1
@@@@ -443,7 +443,7 @@@@
d90 1
a90 1
@@@@ -624,7 +624,7 @@@@
d99 1
a99 1
@@@@ -741,7 +741,7 @@@@
d108 1
a108 1
@@@@ -750,7 +750,7 @@@@
d117 1
a117 1
@@@@ -770,7 +770,7 @@@@
d126 1
a126 1
@@@@ -779,7 +779,7 @@@@
d135 1
a135 1
@@@@ -961,9 +961,9 @@@@
d147 1
a147 1
@@@@ -985,9 +985,9 @@@@
d159 1
a159 1
@@@@ -1787,7 +1787,7 @@@@
d168 1
a168 1
@@@@ -1829,7 +1829,7 @@@@
d177 10
a186 10
@@@@ -2320,7 +2320,7 @@@@
 		    sprintf(str, "%ld", idata->msgno);
 		  else if(idata->bogus < 2 && cdesc->ctype == iSubject)
 		    sprintf(str, "%-*.*s", width, width,
-			    "[ No Message Text Available ]");
+			    "[ LkoH ]");
 	      }
 	      else
 		switch(cdesc->ctype){
@@@@ -2959,8 +2959,8 @@@@
d197 1
a197 1
@@@@ -2969,7 +2969,7 @@@@
d206 1
a206 1
@@@@ -2980,13 +2980,13 @@@@
d222 1
a222 1
@@@@ -3005,7 +3005,7 @@@@
d231 1
a231 1
@@@@ -3021,7 +3021,7 @@@@
d240 1
a240 1
@@@@ -3046,7 +3046,7 @@@@
d249 1
a249 1
@@@@ -3085,21 +3085,21 @@@@
d276 1
a276 1
@@@@ -3236,7 +3236,7 @@@@
d285 1
a285 1
@@@@ -3286,8 +3286,8 @@@@
d296 1
a296 1
@@@@ -4045,7 +4045,7 @@@@
d305 1
a305 1
@@@@ -4398,10 +4398,10 @@@@
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 17
a17 4
--- pine/mailview.c.orig	Fri Jul 17 15:10:35 1998
+++ pine/mailview.c	Tue Jul 28 08:35:04 1998
@@@@ -140,8 +140,8 @@@@
 static struct key view_keys[] = 
d20 3
a22 4
-	{"<","MsgIndex",{MC_INDEX,3,{'i','<',','}},KS_FLDRINDEX},
-	{">","ViewAttch",{MC_VIEW_ATCH,3,{'v','>','.'}},KS_NONE},
+	{"<","",{MC_INDEX,3,{'i','<',','}},KS_FLDRINDEX},
+	{">","˵",{MC_VIEW_ATCH,3,{'v','>','.'}},KS_NONE},
d25 14
a38 2
 	PREVPAGE_MENU,
@@@@ -166,11 +166,11 @@@@
a41 3
-	{"Ret","[View Hilite]",{MC_VIEW_HANDLE,3,
+	{"Ret","[˵ Hilite]",{MC_VIEW_HANDLE,3,
 				{ctrl('m'),ctrl('j'),KEY_RIGHT}},KS_NONE},
d43 1
a43 2
-	{"^B","Prev URL",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
-	{"^F","Next URL",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
d45 7
a51 11
+	{"^B","e@@ URL",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
+	{"^F","@@ URL",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
 	JUMP_MENU,
 	TAB_MENU,
 	HDRMODE_MENU,
@@@@ -187,7 +187,7 @@@@
 #define FLAG_KEY		34
 #define VIEW_PIPE_KEY		35
 
-static struct key nr_anon_view_keys[] = 
+static struct key nr_anon_view_keys[] =
d53 6
a58 3
 	WHEREIS_MENU,
 	QUIT_MENU,
@@@@ -211,7 +211,7 @@@@
d61 37
a97 32
 	NEXTPAGE_MENU,
-	{"F", "Fwd Email", {MC_FORWARD,1,{'f'}}, KS_FORWARD},
+	{"F", "HH", {MC_FORWARD,1,{'f'}}, KS_FORWARD},
 	JUMP_MENU,
 	PRYNTTXT_MENU,
 	SAVE_MENU,
@@@@ -233,7 +233,7 @@@@
 static struct key simple_text_keys[] =
        {HELP_MENU,
 	NULL_MENU,
-	{"E","Exit Viewer",{MC_EXIT,1,{'e'}},KS_NONE},
+	{"E","}",{MC_EXIT,1,{'e'}},KS_NONE},
 	NULL_MENU,
 	NULL_MENU,
 	NULL_MENU,
@@@@ -242,7 +242,7 @@@@
 	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_text_keymenu, simple_text_keys);
 
 
@@@@ -377,7 +377,7 @@@@
 	 * we were viewing.  If so, make sure we don't just come back.
 	 */
 	if(mn_get_total(ps->msgmap) <= 0L || !ps->mail_stream){
-	    q_status_message(SM_ORDER, 0, 3, "No messages to read!");
+	    q_status_message(SM_ORDER, 0, 3, "SiŪHI");
 	    ps->next_screen = mail_index_screen;
 	    break;
d99 15
a113 52
@@@@ -391,7 +391,7 @@@@
 	body      = NULL;
 	if(!(env = mail_fetchstructure(ps->mail_stream, raw_msgno, &body))
 	   || !(mc = mail_elt(ps->mail_stream, raw_msgno))){
-	    q_status_message1(SM_ORDER, 3, 3, "Error getting message %s data",
+	    q_status_message1(SM_ORDER, 3, 3, "oH %s ƮɵoͿ~",
 			      comatose(mn_get_cur(ps->msgmap)));
 	    dprint(1, (debugfile, "!!!! ERROR fetching %s of msg %ld\n",
 		       env ? "elt" : "env", mn_get_cur(ps->msgmap)));
@@@@ -444,7 +444,7 @@@@
 	memset(&scrollargs, 0, sizeof(SCROLL_S));
 	scrollargs.text.text	= so_text(store);
 	scrollargs.text.src	= src;
-	scrollargs.text.desc	= "message";
+	scrollargs.text.desc	= "H";
 
 	/*
 	 * make first selectable handle the default
@@@@ -463,11 +463,11 @@@@
 	else
 	  scrollargs.body_valid = 1;
 
-	scrollargs.bar.title	= "MESSAGE TEXT";
+	scrollargs.bar.title	= "Hr";
 	scrollargs.end_scroll	= view_end_scroll;
 	scrollargs.resize_exit	= 1;
 	scrollargs.help.text	= h_mail_view;
-	scrollargs.help.title	= "HELP FOR MESSAGE TEXT VIEW";
+	scrollargs.help.title	= "HrU";
 	scrollargs.keys.menu	= &view_keymenu;
 	scrollargs.keys.what    = save_what;
 	setbitmap(scrollargs.keys.bitmap);
@@@@ -1190,7 +1190,7 @@@@
     /*---- format and copy envelope ----*/
     if(ps_global->full_header)
       q_status_message(SM_INFO, 0, 3,
-		       "Full header mode ON.  All header text being included");
+		       "YҦ}ҡCҦYr]tb");
 
     HD_INIT(&h, ps_global->VAR_VIEW_HEADERS, ps_global->view_all_except,
 	    FE_DEFAULT);
@@@@ -1229,7 +1229,7 @@@@
 	    if(append_file_name)
 	      fs_give((void **)&append_file_name);
 
-	    q_status_message1(SM_ORDER,3,3,"Can't make temp file: %s",
+	    q_status_message1(SM_ORDER,3,3,"Lkإ߼ȦsɡG%s",
 			      error_description(errno));
 	    return(0);
 	}
@@@@ -1523,7 +1523,7 @@@@
   write_error:
d115 1
a115 117
     if(!(flgs & FM_DISPLAY))
-      q_status_message1(SM_ORDER, 3, 4, "Error writing message: %s",
+      q_status_message1(SM_ORDER, 3, 4, "gJHɵoͿ~G%s",
 			decode_err ? decode_err : error_description(errno));
 
     return(0);
@@@@ -1853,8 +1853,8 @@@@
     char prompt[256], tmp[MAILTMPLEN];
     int  rc, flags, local_h;
     static ESCKEY_S launch_opts[] = {
-	{'y', 'y', "Y", "Yes"},
-	{'n', 'n', "N", "No"},
+	{'y', 'y', "Y", "O"},
+	{'n', 'n', "N", "_"},
 	{-2, 0, NULL, NULL},
 	{-2, 0, NULL, NULL},
 	{0, 'u', "U", "editURL"},
@@@@ -1875,7 +1875,7 @@@@
 	else{
 	    launch_opts[5].ch = -1;
 	    if(!local_h){
-		if(want_to("No Web-Browser application defined!  Define now",
+		if(want_to("|wq Web-BrowserI{bwq",
 			   'y', 0, NO_HELP, WT_SEQ_SENSITIVE) == 'y'){
 		    /* Prompt for the displayer? */
 		    tmp[0] = '\0';
@@@@ -1919,7 +1919,7 @@@@
 				}
 				else{
 				    q_status_message1(SM_ORDER | SM_DING, 2, 2,
-						     "Browser not found: %s",
+						     "䤣sG%s",
 						     error_description(errno));
 				    continue;
 				}
@@@@ -1948,8 +1948,8 @@@@
       return(1);
 
     while(1){
-	sprintf(prompt, "View selected %s %s%.37s%s? ",
-		(handle->type == URL) ? "URL" : "Attachment",
+	sprintf(prompt, "˵ܪ %s %s%.37s%s? ",
+		(handle->type == URL) ? "URL" : "",
 		(handle->type == URL) ? "\"" : "",
 		(handle->type == URL) ? handle->h.url.path : "",
 		(handle->type == URL)
@@@@ -2414,11 +2414,11 @@@@
 	mode = PIPE_RESET | PIPE_USER ;
 	if(syspipe = open_system_pipe(cmd, NULL, NULL, mode)){
 	    close_system_pipe(&syspipe);
-	    q_status_message(SM_ORDER, 0, 4, "VIEWER command completed");
+	    q_status_message(SM_ORDER, 0, 4, "VIEWER RO");
 	}
 	else
 	  q_status_message1(SM_ORDER, 3, 4,
-				"Cannot spawn command : %s", cmd);
+				"Lk_lROG%s", cmd);
     }
     else if(f = url_local_handler(handle->h.url.path)){
 	if((*f)(handle->h.url.path) > 1)
@@@@ -2426,7 +2426,7 @@@@
     }
     else
       q_status_message1(SM_ORDER, 2, 2,
-			"\"Web-Browser\" not defined: Can't open %s",
+			"|wq \"Web-Browser\"GLk} %s",
 			handle->h.url.path);
     
     return(rv);
@@@@ -2746,7 +2746,7 @@@@
     }
     else
       q_status_message(SM_ORDER | SM_DING, 3, 4,
-		       "Can't create space for composer");
+		       "Lks边إߪŶ");
 
     if(outgoing)
       mail_free_envelope(&outgoing);
@@@@ -2810,7 +2810,7 @@@@
 	else if(errstr)
 	  q_status_message(SM_ORDER|SM_DING, 3, 3, errstr);
 	else
-	  cmd_cancelled("URL Launch");
+	  cmd_cancelled("˵ URL");
 
 	break;
 
@@@@ -2833,7 +2833,7 @@@@
 	    if(uid_val != ps_global->mail_stream->uid_validity){
 		/* Complain! */
 		q_status_message(SM_ORDER|SM_DING, 3, 3,
-		     "Warning!  Referenced folder changed since URL recorded");
+		     "ĵiIѦҸƧXw URL O");
 	    }
 
 	    if(uid){
@@@@ -2849,7 +2849,7 @@@@
 
 		if(i > mn_get_total(ps_global->msgmap))
 		  q_status_message(SM_ORDER, 2, 3,
-				   "Couldn't find specified article number");
+				   "䤣w峹s");
 	    }
 	    else if(search){
 		/*
@@@@ -2870,9 +2870,9 @@@@
 		if(i = any_lflagged(ps_global->msgmap, MN_SLCT)){
 		    extern long zoom_index();
 
-		    q_status_message2(SM_ORDER, 0, 3,
-				      "%s message%s selected",
-				      long2string(i), plural(i));
+		    q_status_message1(SM_ORDER, 0, 3,
+				      "w %s ʫH",
+				      long2string(i));
 		    /* Zoom the index! */
 		    zoom_index(ps_global, ps_global->msgmap);
d117 15
a131 1
@@@@ -3011,9 +3011,9 @@@@
d133 1
a133 54
 	    if(auth && *auth != '*')
 	      q_status_message1(SM_ORDER, 3, 3,
-				"Unsupported authentication method.  %s.",
-				user ? "Using standard login"
-				     : "Logging in as \"Anonymous\"");
+				"䴩{ҼҦC%sC",
+				user ? "ϥμзǵnJ"
+				     : "H \"Anonymous\" nJ");
 
 	    /*
 	     * At this point our structure should contain the
@@@@ -3098,7 +3098,7 @@@@
 
 		if(i > mn_get_total(ps_global->msgmap))
 		  q_status_message(SM_ORDER, 2, 3,
-				   "Couldn't find specified article number");
+				   "䤣w峹s");
 	    }
 
 	    break;
@@@@ -3177,7 +3177,7 @@@@
     }
     else
       q_status_message1(SM_ORDER | SM_DING, 0, 3,
-			"Can't find fragment: %s", fragment);
+			"䤣_G%s", fragment);
 
     return(1);
 }
@@@@ -3204,7 +3204,7 @@@@
     dprint(2, (debugfile, "-- bogus url \"%s\": %s\n",
 	       url ? url : "<NULL URL>", reason));
     if(url)
-      q_status_message3(SM_ORDER|SM_DING, 2, 3, "Malformed \"%.*s\" URL: %s",
+      q_status_message3(SM_ORDER|SM_DING, 2, 3, "榡~ \"%.*s\" URLG%s",
 			(void *) (strchr(url, ':') - url), url, reason);
 
     return(0);
@@@@ -3344,7 +3344,7 @@@@
 
   write_error:
     if(style == QStatus)
-      q_status_message1(SM_ORDER, 3, 4, "Error writing message: %s", 
+      q_status_message1(SM_ORDER, 3, 4, "gJHɵoͿ~G%s", 
 			error_description(errno));
 
     return(1);
@@@@ -3594,7 +3594,7 @@@@
 		gf_set_so_writec(&tmp_pc, df_store);
 		if(errstr = dfilter(display_filter, tmp_store, tmp_pc, NULL)){
 		    q_status_message1(SM_ORDER | SM_DING, 3, 3,
-				      "Formatting error: %s", errstr);
+				      "榡~G%s", errstr);
 		    rv = FHT_WRTERR;
d135 2
a136 18
 		else{
@@@@ -3606,7 +3606,7 @@@@
 	    }
 	    else{
 		q_status_message1(SM_ORDER | SM_DING, 3, 3,
-				  "No space for filtered text: %s", errstr);
+				  "SŶLorG%s", errstr);
 		rv = FHT_WRTERR;
 	    }
 	}
@@@@ -3631,7 +3631,7 @@@@
 	    if(errstr = gf_pipe(tmp_gc, final_pc)){
 		rv = FHT_WRTERR;
 		q_status_message1(SM_ORDER | SM_DING, 3, 3,
-				  "Can't build header : %s", errstr);
+				  "Lkإ߼YG%s", errstr);
 	    }
 	}
d138 7
a144 7
@@@@ -3770,7 +3770,7 @@@@
 	format_newsgroup_string("Newsgroups: ", e->newsgroups, prefix, pc);
 	if(e->ngbogus)
 	  q_status_message(SM_ORDER, 0, 3,
-     "Unverified Newsgroup header -- Message MAY or MAY NOT have been posted");
+     "gҹꪺsDոsY -- TiqQiK");
     }
d146 3
a148 88
     if((which & FE_FOLLOWUPTO) && e->followup_to)
@@@@ -4394,7 +4394,7 @@@@
     }
 
     if(!sparms->bar.title)
-      sparms->bar.title = "Text";
+      sparms->bar.title = "r";
 
     if(sparms->bar.style == TitleBarNone)
       sparms->bar.style = MsgTextPercent;
@@@@ -4543,7 +4543,7 @@@@
 	}
 
 	if(first_view && num_display_lines >= get_scroll_text_lines())
-	  q_status_message1(SM_INFO, 0, 1, "ALL of %s", STYLE_NAME(sparms));
+	  q_status_message1(SM_INFO, 0, 1, "%s ", STYLE_NAME(sparms));
 			    
 
 	force      = 0;		/* may not need to next time around */
@@@@ -4659,7 +4659,7 @@@@
 	    whereis_pos.row = 0;
             if(sparms->help.text == NO_HELP || ps_global->nr_mode){
                 q_status_message(SM_ORDER, 0, 5,
-				 "No help text currently available");
+				 "ثe|LU");
                 break;
             }
 
@@@@ -4698,12 +4698,12 @@@@
 		cur_top_line -= scroll_lines;
 		if(cur_top_line <= 0){
 		    cur_top_line = 0;
-		    q_status_message1(SM_INFO, 0, 1, "START of %s",
+		    q_status_message1(SM_INFO, 0, 1, "%s_l",
 				      STYLE_NAME(sparms));
 		}
 	    }
 	    else
-	      q_status_message1(SM_ORDER, 0, 1, "Already at start of %s",
+	      q_status_message1(SM_ORDER, 0, 1, "wgb%s_l",
 				STYLE_NAME(sparms));
             break;
 
@@@@ -4717,12 +4717,12 @@@@
 		cur_top_line += scroll_lines;
 
 		if(cur_top_line + num_display_lines >= get_scroll_text_lines())
-		  q_status_message1(SM_INFO, 0, 1, "END of %s",
+		  q_status_message1(SM_INFO, 0, 1, "%s",
 				    STYLE_NAME(sparms));
             }
 	    else if(!sparms->end_scroll
 		    || !(done = (*sparms->end_scroll)(sparms)))
-	      q_status_message1(SM_ORDER, 0, 1, "Already at end of %s",
+	      q_status_message1(SM_ORDER, 0, 1, "wgb%s",
 				STYLE_NAME(sparms));
 
             break;
@@@@ -4739,11 +4739,11 @@@@
 		    cur_top_line++;
 		    if(cur_top_line + num_display_lines
 						   >= get_scroll_text_lines())
-		      q_status_message1(SM_INFO, 0, 1, "END of %s",
+		      q_status_message1(SM_INFO, 0, 1, "%s",
 					STYLE_NAME(sparms));
 		}
 		else
-		  q_status_message1(SM_ORDER, 0, 1, "Already at end of %s",
+		  q_status_message1(SM_ORDER, 0, 1, "wgb%s",
 				    STYLE_NAME(sparms));
 	    }
 
@@@@ -4760,11 +4760,11 @@@@
 		if(cur_top_line){
 		    cur_top_line--;
 		    if(cur_top_line == 0)
-		      q_status_message1(SM_INFO, 0, 1, "START of %s",
+		      q_status_message1(SM_INFO, 0, 1, "%s_l",
 					STYLE_NAME(sparms));
 		}
 		else
-		  q_status_message1(SM_ORDER, 0, 1, "Already at start of %s",
+		  q_status_message1(SM_ORDER, 0, 1, "wgb%s_l",
 				    STYLE_NAME(sparms));
 	    }
 
@@@@ -4795,7 +4795,7 @@@@
 		}
d150 7
a156 4
 		q_status_message(SM_ORDER, 0, 1,
-				 "Already on last selectable item");
+				 "wgb̫@@ӥiܪؤW");
 	    }
a157 11
 	    break;
@@@@ -4825,7 +4825,7 @@@@
 		}
 
 		q_status_message(SM_ORDER, 0, 1,
-				 "Already on first selectable item");
+				 "wgbĤ@@ӥiܪؤW");
 	    }
 
 	    break;
@@@@ -4844,7 +4844,7 @@@@
d159 8
d168 8
a175 4
 		  case -1 :
-		    cmd_cancelled("View");
+		    cmd_cancelled("˵");
 		    break;
d177 11
a187 31
 		  default :
@@@@ -4931,14 +4931,14 @@@@
 		  q_status_message(SM_ORDER, 0, 3, tmp_20k_buf);
 		else
 		  q_status_message2(SM_ORDER, 0, 3,
-				    "%sFound on line %s on screen",
-				    result ? "Search wrapped to start. " : "",
+				    "%sbeW %s ",
+				    result ? "YjMC" : "",
 				    int2string(whereis_pos.row));
             }
 	    else if(found_on == -1)
-	      cmd_cancelled("Search");
+	      cmd_cancelled("jM");
             else
-	      q_status_message(SM_ORDER | SM_DING, 0, 3, "Word not found");
+	      q_status_message(SM_ORDER | SM_DING, 0, 3, "䤣Ӧr");
 
             break; 
 
@@@@ -4994,7 +4994,7 @@@@
 			      break;
 
 			    case -1 :
-			      cmd_cancelled("View");
+			      cmd_cancelled("˵");
 			      break;
 
 			    default :
@@@@ -5239,13 +5239,13 @@@@
     int         rc, flags;
d189 19
a207 13
     static ESCKEY_S word_search_key[] = { { 0, 0, "", "" },
-					 {ctrl('Y'), 10, "^Y", "First Line"},
-					 {ctrl('V'), 11, "^V", "Last Line"},
+					 {ctrl('Y'), 10, "^Y", "Ĥ@@"},
+					 {ctrl('V'), 11, "^V", "̫@@"},
 					 {-1, 0, NULL, NULL}
 					};
 
     report[0] = '\0';
-    sprintf(prompt, "Word to search for [%s] : ", search_string);
+    sprintf(prompt, "jMr[%s]G", search_string);
     help = NO_HELP;
     nsearch_string[0] = '\0';
d209 14
a222 1
@@@@ -5260,13 +5260,13 @@@@
d226 7
a232 5
-	    strcpy(report, "Searched to First Line.");
+	    strcpy(report, "jMܲĤ@@C");
 	    cursor_pos->row = 0;
 	    cursor_pos->col = 0;
 	    return(0);
d235 15
a249 15
-	    strcpy(report, "Searched to Last Line."); 
+	    strcpy(report, "jM̫ܳ@@C"); 
 	    cursor_pos->row = max(get_scroll_text_lines() - 1, 0);
 	    cursor_pos->col = 0;
 	    return(cursor_pos->row);
@@@@ -6055,10 +6055,10 @@@@
 	    if(*msg_p[0])
 	      for(i = 0; i < msg_q; i++)
 		q_status_message2(SM_ORDER, 3, 4,
-		    "%s Result: %s", title, msg_p[i]);
+		    "%s GG%s", title, msg_p[i]);
 	    else
 	      q_status_message2(SM_ORDER, 0, 4, "%s%s", title,
-		alt_msg ? alt_msg : " command completed");
+		alt_msg ? alt_msg : " RO");
d251 68
a318 11
 	else{
 	    SCROLL_S sargs;
@@@@ -6069,7 +6069,7 @@@@
 	    memset(&sargs, 0, sizeof(SCROLL_S));
 	    sargs.text.text  = f;
 	    sargs.text.src   = FileStar;
-	    sargs.text.desc  = "help text";
+	    sargs.text.desc  = "Ur";
 	    sargs.bar.title  = title;
 	    sargs.bar.style  = TextPercent;
 	    sargs.help.text  = h_simple_text_view;
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 137
a137 33
--- pine/reply.c.orig	Tue Jun 23 12:08:03 1998
+++ pine/reply.c	Wed Jul 15 17:02:37 1998
@@@@ -411,7 +411,7 @@@@
 #endif
 
     /* partially formatted outgoing message */
-    pine_send(outgoing, &body, "COMPOSE MESSAGE REPLY",
+    pine_send(outgoing, &body, "sH^",
 	      fcc.tptr, &reply, NULL, NULL, NULL, 0);
   done:
     pine_free_body(&body);
@@@@ -485,7 +485,7 @@@@
 			 (ADDRESS *) NULL, env->from, 0);
 
     if(ret == 'x') {
-	cmd_cancelled("Reply");
+	cmd_cancelled("^");
 	return(0);
     }
 
@@@@ -534,7 +534,7 @@@@
 	       || (*saved_cc || *saved_resent))){
 	    *flags &= ~RSF_QUERY_REPLY_ALL;
 	    if((ret=want_to(ALL_PMT,'n','x',NO_HELP,WT_SEQ_SENSITIVE)) == 'x'){
-		cmd_cancelled("Reply");
+		cmd_cancelled("^");
 		return(0);
 	    }
 	    else if(ret == 'y')
@@@@ -1099,8 +1099,8 @@@@
 {
     int ret, edited = 0;
     static ESCKEY_S rtq_opts[] = {
d142 345
a486 46
 	{-1, 0, NULL, NULL},	                  /* may be overridden below */
 	{-1, 0, NULL, NULL}
     };
@@@@ -1133,7 +1133,7 @@@@
 				   rtq_opts, edited ? 'y' : 'n',
 				   'x', NO_HELP, RB_SEQ_SENSITIVE)){
 	  case 'x':
-	    cmd_cancelled("Reply");
+	    cmd_cancelled("^");
 	    return(-1);
 
 	  case 'r':
@@@@ -1165,7 +1165,7 @@@@
 			break;
 
 		      case 1:
-			cmd_cancelled("Reply");
+			cmd_cancelled("^");
 
 		      case -1:
 			return(-1);
@@@@ -1542,7 +1542,7 @@@@
 
 	case 'x' :		/* cancel or unknown response */
 	default  :
-	  cmd_cancelled("Reply");
+	  cmd_cancelled("^");
 	  ret = 0;
 	  break;
       }
@@@@ -1708,7 +1708,7 @@@@
      * up...
      */
     if(ret == 'x'){
-	q_status_message(SM_ORDER, 0, 3, "Forward message cancelled");
+	q_status_message(SM_ORDER, 0, 3, "HH");
 	goto clean_early;
     }
     else if(ret == 'y'){			/* attach message[s]!!! */
@@@@ -1840,7 +1840,7 @@@@
       pine_simple_send(outgoing, &body, NULL, NULL, NULL, 1);
     else			/* partially formatted outgoing message */
       pine_send(outgoing, &body,
-		ps->nr_mode ? "SEND MESSAGE" : "FORWARD MESSAGE",
+		ps->nr_mode ? "eXH" : "HH",
 		NULL, NULL, NULL, NULL, NULL, FALSE);
d488 38
a525 1
   clean:
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@d1 85
a85 128
--- pine/mailindx.c.orig	Fri Jul 12 06:48:37 1996
+++ pine/mailindx.c	Sat Jan 17 21:06:20 1998
@@@@ -53,28 +53,28 @@@@
 
 
 static struct key index_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{"O","OTHER CMDS",KS_NONE},
-	{"M","Main Menu",KS_MAINMENU},	{"V","[ViewMsg]",KS_VIEW},
-	{"P","PrevMsg",KS_PREVMSG},	{"N","NextMsg",KS_NEXTMSG},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
-	{"D","Delete",KS_DELETE},	{"U","Undelete",KS_UNDELETE},
-	{"R","Reply",KS_REPLY},		{"F","Forward",KS_FORWARD},
-
-	{"?","Help",KS_SCREENHELP},	{"O","OTHER CMDS",KS_NONE},
-	{"Q","Quit",KS_EXIT},		{"C","Compose",KS_COMPOSER},
-	{"L","ListFldrs",KS_FLDRLIST},	{"G","GotoFldr",KS_GOTOFLDR},
-	{"Tab","NextNew",KS_NONE},	{"W","WhereIs",KS_WHEREIS},
-	{"Y","prYnt",KS_PRINT},		{"T","TakeAddr",KS_TAKEADDR},
-	{"S","Save",KS_SAVE},		{"E","Export",KS_EXPORT},
+       {{"?","U",KS_SCREENHELP},	{"O","䥦RO",KS_NONE},
+	{"M","^D",KS_MAINMENU},	{"V","[ݫH]",KS_VIEW},
+	{"P","e@@",KS_PREVMSG},	{"N","@@",KS_NEXTMSG},
+	{"-","W@@",KS_PREVPAGE},	{"Spc","U@@",KS_NEXTPAGE},
+	{"D","R",KS_DELETE},		{"U","Ϧ^R",KS_UNDELETE},
+	{"R","^H",KS_REPLY},		{"F","H",KS_FORWARD},
+
+	{"?","U",KS_SCREENHELP},	{"O","䥦RO",KS_NONE},
+	{"Q","}",KS_EXIT},		{"C","gH",KS_COMPOSER},
+	{"L","CXH",KS_FLDRLIST},	{"G","iJH",KS_GOTOFLDR},
+	{"Tab","U@@",KS_NONE},	{"W","jM",KS_WHEREIS},
+	{"Y","CL",KS_PRINT},		{"T","oa}",KS_TAKEADDR},
+	{"S","xs",KS_SAVE},		{"E","ץX",KS_EXPORT},
 
-	{"?","Help",KS_SCREENHELP},	{"O","OTHER CMDS",KS_NONE},
+	{"?","U",KS_SCREENHELP},	{"O","䥦RO",KS_NONE},
 	{"X",NULL,KS_NONE},		{"&","unXclude",KS_NONE},
-	{";","Select",KS_SELECT},	{"A","Apply",KS_APPLY},
-	{"$","SortIndex",KS_SORT},	{"J","Jump",KS_JUMPTOMSG},
-	{"H","HdrMode",KS_HDRMODE},	{"B","Bounce",KS_BOUNCE},
-	{"*","Flag",KS_FLAG},		{"|","Pipe",KS_NONE},
+	{";","",KS_SELECT},		{"A","Apply",KS_APPLY},
+	{"$","ޱƧ",KS_SORT},	{"J","",KS_JUMPTOMSG},
+	{"H","YҦ",KS_HDRMODE},	{"B","Bounce",KS_BOUNCE},
+	{"*","X",KS_FLAG},		{"|","Pipe",KS_NONE},
 
-	{"?","Help",KS_SCREENHELP},	{"O","OTHER CMDS",KS_NONE},
+	{"?","U",KS_SCREENHELP},	{"O","䥦RO",KS_NONE},
 	{":","SelectCur",KS_SELECTCUR},	{"Z","ZoomMode",KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
@@@@ -94,32 +94,32 @@@@
 #define ZOOM_KEY 39
 
 static struct key nr_anon_index_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{"W","WhereIs",KS_WHEREIS},
-	{"Q","Quit",KS_EXIT},		{"V","[ViewMsg]",KS_VIEW},
-	{"P","PrevMsg",KS_PREVMSG},	{"N","NextMsg",KS_NEXTMSG},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
-	{"F","Fwd Email",KS_FORWARD},	{"J","Jump",KS_JUMPTOMSG},
-	{"$","SortIndex",KS_SORT},	{NULL,NULL,KS_NONE}};
+       {{"?","U",KS_SCREENHELP},	{"W","jM",KS_WHEREIS},
+	{"Q","}",KS_EXIT},		{"V","[ViewMsg]",KS_VIEW},
+	{"P","e@@",KS_PREVMSG},	{"N","@@",KS_NEXTMSG},
+	{"-","W@@",KS_PREVPAGE},	{"Spc","U@@",KS_NEXTPAGE},
+	{"F","H",KS_FORWARD},	{"J","",KS_JUMPTOMSG},
+	{"$","sƧ",KS_SORT},	{NULL,NULL,KS_NONE}};
 INST_KEY_MENU(nr_anon_index_keymenu, nr_anon_index_keys);
 
 static struct key nr_index_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{"O","OTHER CMDS",KS_NONE},
+       {{"?","U",KS_SCREENHELP},	{"O","䥦RO",KS_NONE},
 	{"Q","Quit",KS_EXIT},		{"V","[ViewMsg]",KS_VIEW},
 	{"P","PrevMsg",KS_PREVMSG},	{"N","NextMsg",KS_NEXTMSG},
 	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
 	{"F","Fwd Email",KS_FORWARD},	{"J","Jump",KS_JUMPTOMSG},
-	{"Y","prYnt",KS_PRINT},		{"S","Save",KS_SAVE},
+	{"Y","CL",KS_PRINT},		{"S","Save",KS_SAVE},
 
-	{"?","Help",KS_SCREENHELP},	{"O","OTHER CMDS",KS_NONE},
+	{"?","U",KS_SCREENHELP},	{"O","䥦RO",KS_NONE},
 	{"E","Export",KS_EXPORT},	{"C","Compose",KS_COMPOSER},
 	{"$","SortIndex",KS_SORT},	{NULL,NULL,KS_NONE},
-	{NULL,NULL,KS_NONE},		{"W","WhereIs",KS_WHEREIS},
+	{NULL,NULL,KS_NONE},		{"W","jM",KS_WHEREIS},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE}};
 INST_KEY_MENU(nr_index_keymenu, nr_index_keys);
   
 static struct key simple_index_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
+       {{"?","U",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
 	{"E","ExitSelect",KS_EXITMODE},	{"S","[Select]",KS_SELECT},
 	{"P","PrevMsg",KS_PREVMSG},	{"N","NextMsg",KS_NEXTMSG},
 	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
@@@@ -630,7 +630,7 @@@@
 		if(i <= 1L){
 		    if(mn_get_cur(msgmap) == 1L)
 		      q_status_message(SM_ORDER, 0, 1,
-			  "Already at start of Index");
+			  "wgbު_YF");
 
 		    break;
 		}
@@@@ -664,7 +664,7 @@@@
 
 		if(i >= mn_get_total(msgmap)){
 		    if(mn_get_cur(msgmap) == k)
-		      q_status_message(SM_ORDER,0,1,"Already at end of Index");
+		      q_status_message(SM_ORDER,0,1,"wgbުF");
 
 		    break;
 		}
@@@@ -884,6 +884,7 @@@@
 
 		    break;
 
+		  case KEY_LEFT:
 		  case 'e':		/* exit */
 		  case 'E':
 		  case PF3:
@@@@ -897,6 +898,7 @@@@
 
 		  case 's':		/* select */
 		  case ctrl('M'):
+		  case KEY_RIGHT:
 		  case ctrl('J'):
 		  case PF4:
 		    ps_global->redrawer = NULL;
@
