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


1.10
date	2000.11.17.19.06.53;	author keith;	state dead;
branches;
next	1.9;

1.9
date	99.12.27.00.58.49;	author steve;	state Exp;
branches;
next	1.8;

1.8
date	99.11.01.00.40.57;	author steve;	state Exp;
branches;
next	1.7;

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

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

1.5
date	98.08.24.01.24.43;	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.10
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/mailview.c.orig	Tue Nov 16 03:03:45 1999
+++ pine/mailview.c	Fri Nov 19 16:18:24 1999
@@@@ -162,8 +162,8 @@@@
 static struct key view_keys[] = 
        {HELP_MENU,
 	OTHER_MENU,
-	{"<","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},
 	PREVMSG_MENU,
 	NEXTMSG_MENU,
 	PREVPAGE_MENU,
@@@@ -188,11 +188,11 @@@@
 
 	HELP_MENU,
 	OTHER_MENU,
-	{"Ret","[View Hilite]",{MC_VIEW_HANDLE,3,
+	{"Ret","[˵ Hilite]",{MC_VIEW_HANDLE,3,
 				{ctrl('m'),ctrl('j'),KEY_RIGHT}},KS_NONE},
-	{":","SelectCur",{MC_SELCUR,1,{':'}},KS_SELECTCUR},
-	{"^B","Prev URL",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
-	{"^F","Next URL",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
+	{":","",{MC_SELCUR,1,{':'}},KS_SELECTCUR},
+	{"^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,
@@@@ -222,7 +222,7 @@@@
 #define FLAG_KEY		34
 #define VIEW_PIPE_KEY		35
 
-static struct key nr_anon_view_keys[] = 
+static struct key nr_anon_view_keys[] =
        {HELP_MENU,
 	WHEREIS_MENU,
 	QUIT_MENU,
@@@@ -246,7 +246,7 @@@@
 	NEXTMSG_MENU,
 	PREVPAGE_MENU,
 	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,
@@@@ -268,7 +268,7 @@@@
 static struct key simple_text_keys[] =
        {HELP_MENU,
 	NULL_MENU,
-	{"E","Exit Viewer",{MC_EXIT,1,{'e'}},KS_EXITMODE},
+	{"E","}",{MC_EXIT,1,{'e'}},KS_EXITMODE},
 	NULL_MENU,
 	NULL_MENU,
 	NULL_MENU,
@@@@ -277,7 +277,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);
 
 
@@@@ -437,7 +437,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;
 	}
@@@@ -452,7 +452,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)));
@@@@ -510,7 +510,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
@@@@ -536,11 +536,11 @@@@
 	    offset = 0L;
 	}
 	  
-	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);
@@@@ -1327,7 +1327,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);
@@@@ -1366,7 +1366,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);
 	}
@@@@ -1675,7 +1675,7 @@@@
   write_error:
 
     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);
@@@@ -2237,12 +2237,12 @@@@
     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"},
-	{0, 'a', "A", "editApp"},
+	{0, 'u', "U", "s URL"},
+	{0, 'a', "A", "sε{"},
 	{-1, 0, NULL, NULL}};
 
     if(handle->type == URL){
@@@@ -2268,11 +2268,11 @@@@
 	    if(!local_h){
 	      if(ps_global->vars[V_BROWSER].is_fixed){
 		  q_status_message(SM_ORDER, 3, 4,
-				   "URL-Viewer is disabled by sys-admin");
+				   "URL ˵{wQtκ޲z");
 		  return(0);
 	      }
 	      else{
-		if(want_to("No URL-Viewer application defined.  Define now",
+		if(want_to("|wq URL ˵{I{bwq",
 			   'y', 0, NO_HELP, WT_SEQ_SENSITIVE) == 'y'){
 		    /* Prompt for the displayer? */
 		    tmp[0] = '\0';
@@@@ -2316,7 +2316,7 @@@@
 				}
 				else{
 				    q_status_message1(SM_ORDER | SM_DING, 2, 2,
-						     "Browser not found: %s",
+						     "䤣sG%s",
 						     error_description(errno));
 				    continue;
 				}
@@@@ -2360,8 +2360,8 @@@@
 		  max(0,sc - 25), handle->h.url.path+7,
 		  (strlen(handle->h.url.path+7) > max(0,sc-25)) ? "..." : "");
 	else
-	  sprintf(prompt, "View selected %s %s%.*s%s ? ",
-		  (handle->type == URL) ? "URL" : "Attachment",
+	  sprintf(prompt, "˵ܪ %s %s%.*s%s ? ",
+		  (handle->type == URL) ? "URL" : "",
 		  (handle->type == URL) ? "\"" : "",
 		  max(0,sc-27),
 		  (handle->type == URL) ? handle->h.url.path : "",
@@@@ -2420,10 +2420,10 @@@@
 			OE_KEEP_TRAILING_SPACE |
 			OE_DISALLOW_HELP;
 
-		sprintf(prompt, "Viewer command: ");
+		sprintf(prompt, "˵ROG");
 
 		rc = optionally_enter(tmp, -FOOTER_ROWS(ps_global), 0,
-				      MAILTMPLEN - 1, "Viewer Command: ",
+				      MAILTMPLEN - 1, "˵ROG",
 				      NULL, NO_HELP, &flags);
 		if(rc == 0){
 		    if(flags & OE_USER_MODIFIED){
@@@@ -3763,11 +3763,11 @@@@
 	mode = PIPE_RESET | PIPE_USER ;
 	if(syspipe = open_system_pipe(cmd, NULL, NULL, mode, 0)){
 	    close_system_pipe(&syspipe);
-	    q_status_message(SM_ORDER, 0, 4, "VIEWER command completed");
+	    q_status_message(SM_ORDER, 0, 4, "˵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)
@@@@ -3775,7 +3775,7 @@@@
     }
     else
       q_status_message1(SM_ORDER, 2, 2,
-			"\"URL-Viewer\" not defined: Can't open %s",
+			"|wq \"URL-˵\"GLk} %s",
 			handle->h.url.path);
     
     return(rv);
@@@@ -3787,7 +3787,7 @@@@
     int return_value;
 {
     q_status_message(SM_ORDER | SM_DING, 3, 3,
-		     "Can't spawn.  Command too long.");
+		     "Lk_lCROӪC");
     return(return_value);
 }
 
@@@@ -4132,7 +4132,7 @@@@
     }
     else
       q_status_message(SM_ORDER | SM_DING, 3, 4,
-		       "Can't create space for composer");
+		       "Lks边إߪŶ");
 
 outta_here:
     if(outgoing)
@@@@ -4203,7 +4203,7 @@@@
 	else if(errstr)
 	  q_status_message(SM_ORDER|SM_DING, 3, 3, errstr);
 	else
-	  cmd_cancelled("URL Launch");
+	  cmd_cancelled("˵ URL");
 
 	break;
 
@@@@ -4226,7 +4226,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){
@@@@ -4242,7 +4242,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){
 		/*
@@@@ -4263,9 +4263,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);
 		}
@@@@ -4413,7 +4413,7 @@@@
 
 	if(auth && *auth != '*')
 	  q_status_message(SM_ORDER, 3, 3,
-	     "Unsupported authentication method.  Using standard login.");
+	     "䴩{Ҥ覡CϥμзǵnJC");
 
 	/*
 	 * At this point our structure should contain the
@@@@ -4497,7 +4497,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;
@@@@ -4614,7 +4614,7 @@@@
     }
     else
       q_status_message1(SM_ORDER | SM_DING, 0, 3,
-			"Can't find fragment: %s", fragment);
+			"䤣_G%s", fragment);
 
     return(1);
 }
@@@@ -4641,7 +4641,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);
@@@@ -4800,7 +4800,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);
@@@@ -5053,7 +5053,7 @@@@
 		gf_set_so_readc(&tmp_gc, 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;
 		}
 		else
@@@@ -5063,7 +5063,7 @@@@
 	    }
 	    else{
 		q_status_message(SM_ORDER | SM_DING, 3, 3,
-				  "No space for filtered text.");
+				  "SŶLorC");
 		rv = FHT_WRTERR;
 	    }
 	}
@@@@ -5105,7 +5105,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);
 	    }
 	}
 
@@@@ -5243,7 +5243,7 @@@@
 	format_newsgroup_string("Newsgroups: ", e->newsgroups, flags, 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");
     }
 
     if((which & FE_FOLLOWUPTO) && e->followup_to)
@@@@ -6002,7 +6002,7 @@@@
     }
 
     if(!sparms->bar.title)
-      sparms->bar.title = "Text";
+      sparms->bar.title = "r";
 
     if(sparms->bar.style == TitleBarNone)
       sparms->bar.style = MsgTextPercent;
@@@@ -6175,7 +6175,7 @@@@
 	}
 
 	if(first_view && num_display_lines >= 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 */
@@@@ -6313,7 +6313,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;
             }
 
@@@@ -6352,7 +6352,7 @@@@
 		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));
 		}
 	    }
@@@@ -6368,7 +6368,7 @@@@
 		}
 
 		if(!next_handle)
-		  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));
 
 	    }
@@@@ -6386,12 +6386,12 @@@@
 		cur_top_line += scroll_lines;
 
 		if(cur_top_line + num_display_lines >= 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));
 		/* hilite last available handle */
 		if(sparms->text.handles){
@@@@ -6461,11 +6461,11 @@@@
 		    whereis_pos.row = 0;
 		    cur_top_line++;
 		    if(cur_top_line + num_display_lines >= 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));
 	    }
 
@@@@ -6528,11 +6528,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));
 	    }
 
@@@@ -6566,7 +6566,7 @@@@
 		}
 
 		q_status_message1(SM_ORDER, 0, 1,
-				  "Already on last item in %s",
+				  "wgb%s̫@@ӥiܪؤW",
 				  STYLE_NAME(sparms));
 	    }
 
@@@@ -6600,7 +6600,7 @@@@
 		}
 
 		q_status_message1(SM_ORDER, 0, 1,
-				  "Already on first item in %s",
+				  "wgb%sĤ@@ӥiܪؤW",
 				  STYLE_NAME(sparms));
 	    }
 
@@@@ -6751,8 +6751,8 @@@@
 		  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));
 
 		if(key){
@@@@ -6769,9 +6769,9 @@@@
 		}
             }
 	    else if(found_on == -1)
-	      cmd_cancelled("Search");
+	      cmd_cancelled("jM");
             else
-	      q_status_message(SM_ORDER, 0, 3, "Word not found");
+	      q_status_message(SM_ORDER, 0, 3, "䤣Ӧr");
 	    }
 
             break; 
@@@@ -7144,13 +7144,13 @@@@
     int         rc, flags;
     static char search_string[MAX_SEARCH+1] = { '\0' };
     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';
 
@@@@ -7165,11 +7165,11 @@@@
             continue;
         }
 	else if(rc == 10){
-	    strcpy(report, "Searched to First Line.");
+	    strcpy(report, "jMܲĤ@@C");
 	    return(-4);
 	}
 	else if(rc == 11){
-	    strcpy(report, "Searched to Last Line."); 
+	    strcpy(report, "jM̫ܳ@@C"); 
 	    return(-5);
 	}
 
@@@@ -8308,12 +8308,12 @@@@
 		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 with no output");
+				      : " ROw(SX)");
 
 		fclose(f);
 		f = NULL;
@@@@ -8326,7 +8326,7 @@@@
 		q_status_message2(SM_ORDER, 0, 4, "%s%s", title,
 				  alt_msg
 				    ? alt_msg
-				    : " command completed with no output");
+				    : " ROw(SX)");
 		fclose(f);
 		f = NULL;
 	    }
@@@@ -8341,7 +8341,7 @@@@
 	    memset(&sargs, 0, sizeof(SCROLL_S));
 	    sargs.text.text  = f;
 	    sargs.text.src   = FileStar;
-	    sargs.text.desc  = "output";
+	    sargs.text.desc  = "X";
 	    sargs.bar.title  = title;
 	    sargs.bar.style  = TextPercent;
 	    sargs.help.text  = h_simple_text_view;
@@@@ -8542,7 +8542,7 @@@@
       break;
       
     case -1 :
-      cmd_cancelled("View");
+      cmd_cancelled("˵");
       break;
       
     default :
@


1.9
log
@Update to version 4.21.

PR:		14994
Submitted by:	maintainer
@
text
@@


1.8
log
@Update to version 4.20.

PR:		14575
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/mailview.c.orig	Tue Oct 12 09:19:53 1999
+++ pine/mailview.c	Thu Oct 14 12:25:15 1999
@@@@ -159,8 +159,8 @@@@
d14 1
a14 1
@@@@ -185,11 +185,11 @@@@
d30 1
a30 1
@@@@ -219,7 +219,7 @@@@
d39 1
a39 1
@@@@ -243,7 +243,7 @@@@
d48 1
a48 1
@@@@ -265,7 +265,7 @@@@
d57 1
a57 1
@@@@ -274,7 +274,7 @@@@
d66 1
a66 1
@@@@ -430,7 +430,7 @@@@
d75 1
a75 1
@@@@ -444,7 +444,7 @@@@
d84 1
a84 1
@@@@ -502,7 +502,7 @@@@
d93 1
a93 1
@@@@ -528,11 +528,11 @@@@
d107 1
a107 1
@@@@ -1319,7 +1319,7 @@@@
d116 1
a116 1
@@@@ -1358,7 +1358,7 @@@@
d125 1
a125 1
@@@@ -1665,7 +1665,7 @@@@
d134 1
a134 1
@@@@ -2137,12 +2137,12 @@@@
d151 1
a151 1
@@@@ -2168,11 +2168,11 @@@@
d165 1
a165 1
@@@@ -2216,7 +2216,7 @@@@
d174 1
a174 1
@@@@ -2260,8 +2260,8 @@@@
d185 1
a185 1
@@@@ -2320,10 +2320,10 @@@@
d198 1
a198 1
@@@@ -3639,11 +3639,11 @@@@
d212 1
a212 1
@@@@ -3651,7 +3651,7 @@@@
d221 1
a221 1
@@@@ -3663,7 +3663,7 @@@@
d230 1
a230 1
@@@@ -4008,7 +4008,7 @@@@
d239 1
a239 1
@@@@ -4079,7 +4079,7 @@@@
d248 1
a248 1
@@@@ -4102,7 +4102,7 @@@@
d257 1
a257 1
@@@@ -4118,7 +4118,7 @@@@
d266 1
a266 1
@@@@ -4139,9 +4139,9 @@@@
d279 1
a279 1
@@@@ -4289,7 +4289,7 @@@@
d288 1
a288 1
@@@@ -4373,7 +4373,7 @@@@
d297 1
a297 1
@@@@ -4490,7 +4490,7 @@@@
d306 1
a306 1
@@@@ -4517,7 +4517,7 @@@@
d315 1
a315 1
@@@@ -4678,7 +4678,7 @@@@
d324 1
a324 1
@@@@ -4931,7 +4931,7 @@@@
d333 1
a333 1
@@@@ -4941,7 +4941,7 @@@@
d342 1
a342 1
@@@@ -4983,7 +4983,7 @@@@
d351 1
a351 1
@@@@ -5121,7 +5121,7 @@@@
d360 1
a360 1
@@@@ -5880,7 +5880,7 @@@@
d369 1
a369 1
@@@@ -6053,7 +6053,7 @@@@
d378 1
a378 1
@@@@ -6191,7 +6191,7 @@@@
d387 1
a387 1
@@@@ -6230,7 +6230,7 @@@@
d396 1
a396 1
@@@@ -6246,7 +6246,7 @@@@
d405 1
a405 1
@@@@ -6264,12 +6264,12 @@@@
d420 1
a420 1
@@@@ -6339,11 +6339,11 @@@@
d434 1
a434 1
@@@@ -6406,11 +6406,11 @@@@
d448 1
a448 1
@@@@ -6444,7 +6444,7 @@@@
d457 1
a457 1
@@@@ -6478,7 +6478,7 @@@@
d466 1
a466 1
@@@@ -6611,8 +6611,8 @@@@
d477 1
a477 1
@@@@ -6629,9 +6629,9 @@@@
d484 2
a485 2
-	      q_status_message(SM_ORDER | SM_DING, 0, 3, "Word not found");
+	      q_status_message(SM_ORDER | SM_DING, 0, 3, "䤣Ӧr");
d489 1
a489 1
@@@@ -7002,13 +7002,13 @@@@
d506 1
a506 1
@@@@ -7023,13 +7023,13 @@@@
d512 1
a512 3
 	    cursor_pos->row = 0;
 	    cursor_pos->col = 0;
 	    return(0);
d517 4
a520 4
 	    cursor_pos->row = max(scroll_text_lines() - 1, 0);
 	    cursor_pos->col = 0;
 	    return(cursor_pos->row);
@@@@ -8165,12 +8165,12 @@@@
d535 1
a535 1
@@@@ -8183,7 +8183,7 @@@@
d544 1
a544 1
@@@@ -8198,7 +8198,7 @@@@
d553 1
a553 1
@@@@ -8399,7 +8399,7 @@@@
@


1.7
log
@Update to version 4.10.

PR:		10245
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/mailview.c.orig	Tue Feb  2 01:26:04 1999
+++ pine/mailview.c	Tue Feb 23 15:45:46 1999
@@@@ -157,8 +157,8 @@@@
d14 1
a14 1
@@@@ -183,11 +183,11 @@@@
d30 1
a30 1
@@@@ -204,7 +204,7 @@@@
d39 1
a39 1
@@@@ -228,7 +228,7 @@@@
d48 1
a48 1
@@@@ -250,7 +250,7 @@@@
d57 1
a57 1
@@@@ -259,7 +259,7 @@@@
d66 1
a66 1
@@@@ -403,7 +403,7 @@@@
d75 1
a75 1
@@@@ -417,7 +417,7 @@@@
d84 1
a84 1
@@@@ -472,7 +472,7 @@@@
d93 4
a96 4
@@@@ -492,11 +492,11 @@@@
 	else
 	  scrollargs.body_valid = 1;
 
d107 1
a107 1
@@@@ -1237,7 +1237,7 @@@@
d116 1
a116 1
@@@@ -1276,7 +1276,7 @@@@
d125 1
a125 1
@@@@ -1570,7 +1570,7 @@@@
d134 1
a134 1
@@@@ -1908,12 +1908,12 @@@@
d151 1
a151 1
@@@@ -1939,11 +1939,11 @@@@
d165 1
a165 1
@@@@ -1987,7 +1987,7 @@@@
d174 25
a198 12
@@@@ -2017,8 +2017,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)
@@@@ -2723,11 +2723,11 @@@@
d212 1
a212 1
@@@@ -2735,7 +2735,7 @@@@
d221 1
a221 1
@@@@ -2747,7 +2747,7 @@@@
d230 1
a230 1
@@@@ -3046,7 +3046,7 @@@@
d237 1
d239 1
a239 2
       mail_free_envelope(&outgoing);
@@@@ -3113,7 +3113,7 @@@@
d248 1
a248 1
@@@@ -3136,7 +3136,7 @@@@
d257 1
a257 1
@@@@ -3152,7 +3152,7 @@@@
d266 1
a266 1
@@@@ -3173,9 +3173,9 @@@@
d279 1
a279 1
@@@@ -3314,9 +3314,9 @@@@
d281 8
a288 12
 	    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
@@@@ -3401,7 +3401,7 @@@@
d297 1
a297 1
@@@@ -3515,7 +3515,7 @@@@
d306 1
a306 1
@@@@ -3542,7 +3542,7 @@@@
d315 1
a315 1
@@@@ -3684,7 +3684,7 @@@@
d324 1
a324 1
@@@@ -3935,7 +3935,7 @@@@
d333 1
a333 1
@@@@ -3945,7 +3945,7 @@@@
d336 3
a338 3
 		q_status_message1(SM_ORDER | SM_DING, 3, 3,
-				  "No space for filtered text: %s", errstr);
+				  "SŶLorG%s", errstr);
d342 1
a342 1
@@@@ -3971,7 +3971,7 @@@@
d351 2
a352 2
@@@@ -4115,7 +4115,7 @@@@
 	format_newsgroup_string("Newsgroups: ", e->newsgroups, prefix, pc);
d360 1
a360 1
@@@@ -4756,7 +4756,7 @@@@
d369 1
a369 1
@@@@ -4914,7 +4914,7 @@@@
d378 1
a378 1
@@@@ -5047,7 +5047,7 @@@@
d387 1
a387 1
@@@@ -5086,12 +5086,12 @@@@
d396 7
a402 4
 	    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));
d404 2
a405 2
 		/* hilite last available handle */
@@@@ -5117,12 +5117,12 @@@@
d420 1
a420 1
@@@@ -5184,11 +5184,11 @@@@
d434 1
a434 1
@@@@ -5243,11 +5243,11 @@@@
d448 1
a448 1
@@@@ -5281,7 +5281,7 @@@@
d457 1
a457 1
@@@@ -5315,7 +5315,7 @@@@
d466 1
a466 10
@@@@ -5335,7 +5335,7 @@@@
 		    break;
 
 		  case -1 :
-		    cmd_cancelled("View");
+		    cmd_cancelled("˵");
 		    break;
 
 		  default :
@@@@ -5434,8 +5434,8 @@@@
d477 1
a477 1
@@@@ -5452,9 +5452,9 @@@@
d489 1
a489 10
@@@@ -5548,7 +5548,7 @@@@
 				break;
 
 			      case -1 :
-				cmd_cancelled("View");
+				cmd_cancelled("˵");
 				break;
 
 			      default :
@@@@ -5836,13 +5836,13 @@@@
d506 1
a506 1
@@@@ -5857,13 +5857,13 @@@@
d522 1
a522 1
@@@@ -6808,12 +6808,12 @@@@
d537 1
a537 1
@@@@ -6826,7 +6826,7 @@@@
d546 1
a546 1
@@@@ -6841,7 +6841,7 @@@@
d555 9
@


1.6
log
@Update to version 4.05.

PR:		8025
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/mailview.c.orig	Thu Sep 17 05:56:10 1998
+++ pine/mailview.c	Tue Sep 22 19:30:34 1998
@@@@ -145,8 +145,8 @@@@
d14 1
a14 1
@@@@ -171,11 +171,11 @@@@
d30 1
a30 1
@@@@ -192,7 +192,7 @@@@
d39 1
a39 1
@@@@ -216,7 +216,7 @@@@
d48 1
a48 1
@@@@ -238,7 +238,7 @@@@
d57 1
a57 1
@@@@ -247,7 +247,7 @@@@
d66 1
a66 1
@@@@ -388,7 +388,7 @@@@
d75 1
a75 1
@@@@ -402,7 +402,7 @@@@
d84 1
a84 1
@@@@ -457,7 +457,7 @@@@
d93 1
a93 1
@@@@ -477,11 +477,11 @@@@
d107 1
a107 1
@@@@ -1214,7 +1214,7 @@@@
d116 1
a116 1
@@@@ -1253,7 +1253,7 @@@@
d125 1
a125 1
@@@@ -1547,7 +1547,7 @@@@
d134 1
a134 1
@@@@ -1885,12 +1885,12 @@@@
d151 6
a156 1
@@@@ -1920,7 +1920,7 @@@@
d160 1
a160 1
-		if(want_to("No URL-Viewer application defined!  Define now",
d165 1
a165 1
@@@@ -1964,7 +1964,7 @@@@
d174 1
a174 1
@@@@ -1994,8 +1994,8 @@@@
d185 1
a185 1
@@@@ -2606,11 +2606,11 @@@@
d187 1
a187 1
 	if(syspipe = open_system_pipe(cmd, NULL, NULL, mode)){
d199 1
a199 1
@@@@ -2618,7 +2618,7 @@@@
d208 1
a208 1
@@@@ -2630,7 +2630,7 @@@@
d217 1
a217 1
@@@@ -2920,7 +2920,7 @@@@
d226 1
a226 1
@@@@ -2984,7 +2984,7 @@@@
d235 1
a235 1
@@@@ -3007,7 +3007,7 @@@@
d244 1
a244 1
@@@@ -3023,7 +3023,7 @@@@
d253 1
a253 1
@@@@ -3044,9 +3044,9 @@@@
d266 1
a266 1
@@@@ -3185,9 +3185,9 @@@@
d279 1
a279 1
@@@@ -3272,7 +3272,7 @@@@
d288 1
a288 1
@@@@ -3386,7 +3386,7 @@@@
d297 1
a297 1
@@@@ -3413,7 +3413,7 @@@@
d306 1
a306 1
@@@@ -3554,7 +3554,7 @@@@
d315 1
a315 1
@@@@ -3805,7 +3805,7 @@@@
d324 1
a324 1
@@@@ -3815,7 +3815,7 @@@@
d333 1
a333 1
@@@@ -3841,7 +3841,7 @@@@
d342 1
a342 1
@@@@ -3984,7 +3984,7 @@@@
d351 1
a351 1
@@@@ -4624,7 +4624,7 @@@@
d360 1
a360 1
@@@@ -4773,7 +4773,7 @@@@
d363 1
a363 1
 	if(first_view && num_display_lines >= get_scroll_text_lines())
d365 1
a365 1
+	  q_status_message1(SM_INFO, 0, 1, "%s ", STYLE_NAME(sparms));
d369 1
a369 1
@@@@ -4898,7 +4898,7 @@@@
d378 1
a378 1
@@@@ -4937,12 +4937,12 @@@@
d387 4
a390 5
 	    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;
d392 2
a393 1
@@@@ -4956,12 +4956,12 @@@@
d396 1
a396 1
 		if(cur_top_line + num_display_lines >= get_scroll_text_lines())
d402 8
a409 7
 		    || !(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;
@@@@ -4978,11 +4978,11 @@@@
d411 1
a411 2
 		    if(cur_top_line + num_display_lines
 						   >= get_scroll_text_lines())
d422 1
a422 1
@@@@ -4999,11 +4999,11 @@@@
d436 1
a436 1
@@@@ -5034,7 +5034,7 @@@@
d439 4
a442 3
 		q_status_message(SM_ORDER, 0, 1,
-				 "Already on last selectable item");
+				 "wgb̫@@ӥiܪؤW");
d445 1
a445 2
 	    break;
@@@@ -5064,7 +5064,7 @@@@
d448 4
a451 3
 		q_status_message(SM_ORDER, 0, 1,
-				 "Already on first selectable item");
+				 "wgbĤ@@ӥiܪؤW");
d454 1
a454 2
 	    break;
@@@@ -5083,7 +5083,7 @@@@
d463 1
a463 1
@@@@ -5170,14 +5170,14 @@@@
d472 4
d483 1
d486 2
d489 4
a492 7
@@@@ -5257,7 +5257,7 @@@@
 			      break;
 
 			    case -1 :
-			      cmd_cancelled("View");
+			      cmd_cancelled("˵");
 			      break;
d494 2
a495 2
 			    default :
@@@@ -5522,13 +5522,13 @@@@
d512 1
a512 1
@@@@ -5543,13 +5543,13 @@@@
d525 1
a525 1
 	    cursor_pos->row = max(get_scroll_text_lines() - 1, 0);
d528 25
a552 14
@@@@ -6411,10 +6411,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");
 	}
 	else{
 	    SCROLL_S sargs;
@@@@ -6425,7 +6425,7 @@@@
d556 2
a557 2
-	    sargs.text.desc  = "help text";
+	    sargs.text.desc  = "Ur";
@


1.5
log
@Update to version 4.0a2.

PR:		7672
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/mailview.c.orig	Wed Aug 19 10:37:26 1998
+++ pine/mailview.c	Wed Aug 19 10:45:24 1998
@@@@ -140,8 +140,8 @@@@
d14 1
a14 1
@@@@ -166,11 +166,11 @@@@
d30 1
a30 1
@@@@ -187,7 +187,7 @@@@
d39 1
a39 1
@@@@ -211,7 +211,7 @@@@
d48 1
a48 1
@@@@ -233,7 +233,7 @@@@
d52 2
a53 2
-	{"E","Exit Viewer",{MC_EXIT,1,{'e'}},KS_NONE},
+	{"E","}",{MC_EXIT,1,{'e'}},KS_NONE},
d57 1
a57 1
@@@@ -242,7 +242,7 @@@@
d66 1
a66 1
@@@@ -377,7 +377,7 @@@@
d75 1
a75 1
@@@@ -391,7 +391,7 @@@@
d84 1
a84 1
@@@@ -444,7 +444,7 @@@@
d93 1
a93 1
@@@@ -463,11 +463,11 @@@@
d107 1
a107 1
@@@@ -1196,7 +1196,7 @@@@
d116 1
a116 1
@@@@ -1235,7 +1235,7 @@@@
d125 1
a125 1
@@@@ -1529,7 +1529,7 @@@@
d134 1
a134 1
@@@@ -1865,8 +1865,8 @@@@
d144 13
a156 7
 	{0, 'u', "U", "editURL"},
@@@@ -1887,7 +1887,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",
d160 1
a160 1
@@@@ -1931,7 +1931,7 @@@@
d169 1
a169 1
@@@@ -1960,8 +1960,8 @@@@
d180 1
a180 1
@@@@ -2426,11 +2426,11 @@@@
d185 1
a185 1
+	    q_status_message(SM_ORDER, 0, 4, "VIEWER RO");
d189 2
a190 2
-				"Cannot spawn command : %s", cmd);
+				"Lk_lROG%s", cmd);
d194 1
a194 1
@@@@ -2438,7 +2438,7 @@@@
d198 2
a199 2
-			"\"Web-Browser\" not defined: Can't open %s",
+			"|wq \"Web-Browser\"GLk} %s",
d203 10
a212 1
@@@@ -2758,7 +2758,7 @@@@
d221 1
a221 1
@@@@ -2822,7 +2822,7 @@@@
d230 1
a230 1
@@@@ -2845,7 +2845,7 @@@@
d239 1
a239 1
@@@@ -2861,7 +2861,7 @@@@
d248 1
a248 1
@@@@ -2882,9 +2882,9 @@@@
d261 1
a261 1
@@@@ -3023,9 +3023,9 @@@@
d274 1
a274 1
@@@@ -3110,7 +3110,7 @@@@
d283 1
a283 1
@@@@ -3189,7 +3189,7 @@@@
d292 1
a292 1
@@@@ -3216,7 +3216,7 @@@@
d301 1
a301 1
@@@@ -3356,7 +3356,7 @@@@
d310 2
a311 2
@@@@ -3606,7 +3606,7 @@@@
 		gf_set_so_writec(&tmp_pc, df_store);
d318 2
a319 2
 		else{
@@@@ -3618,7 +3618,7 @@@@
d328 1
a328 1
@@@@ -3643,7 +3643,7 @@@@
d337 1
a337 1
@@@@ -3782,7 +3782,7 @@@@
d346 1
a346 1
@@@@ -4406,7 +4406,7 @@@@
d355 1
a355 1
@@@@ -4555,7 +4555,7 @@@@
d364 1
a364 1
@@@@ -4671,7 +4671,7 @@@@
d373 1
a373 1
@@@@ -4710,12 +4710,12 @@@@
d388 1
a388 1
@@@@ -4729,12 +4729,12 @@@@
d403 1
a403 1
@@@@ -4751,11 +4751,11 @@@@
d417 1
a417 1
@@@@ -4772,11 +4772,11 @@@@
d431 1
a431 1
@@@@ -4807,7 +4807,7 @@@@
d440 1
a440 1
@@@@ -4837,7 +4837,7 @@@@
d449 1
a449 1
@@@@ -4856,7 +4856,7 @@@@
d458 1
a458 1
@@@@ -4943,14 +4943,14 @@@@
d477 1
a477 1
@@@@ -5006,7 +5006,7 @@@@
d486 1
a486 1
@@@@ -5251,13 +5251,13 @@@@
d503 1
a503 1
@@@@ -5272,13 +5272,13 @@@@
d519 1
a519 1
@@@@ -6069,10 +6069,10 @@@@
d532 1
a532 1
@@@@ -6083,7 +6083,7 @@@@
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pine/mailview.c.orig	Fri Jul 17 15:10:35 1998
+++ pine/mailview.c	Tue Aug  4 12:42:18 1998
d107 1
a107 1
@@@@ -1190,7 +1190,7 @@@@
d116 1
a116 1
@@@@ -1229,7 +1229,7 @@@@
d125 1
a125 1
@@@@ -1523,7 +1523,7 @@@@
d134 1
a134 1
@@@@ -1853,8 +1853,8 @@@@
d145 1
a145 1
@@@@ -1875,7 +1875,7 @@@@
d154 1
a154 1
@@@@ -1919,7 +1919,7 @@@@
d163 1
a163 1
@@@@ -1948,8 +1948,8 @@@@
d174 1
a174 1
@@@@ -2414,11 +2414,11 @@@@
d188 1
a188 1
@@@@ -2426,7 +2426,7 @@@@
d197 1
a197 1
@@@@ -2746,7 +2746,7 @@@@
d206 1
a206 1
@@@@ -2810,7 +2810,7 @@@@
d215 1
a215 1
@@@@ -2833,7 +2833,7 @@@@
d224 1
a224 1
@@@@ -2849,7 +2849,7 @@@@
d233 1
a233 1
@@@@ -2870,9 +2870,9 @@@@
d246 1
a246 1
@@@@ -3011,9 +3011,9 @@@@
d259 1
a259 1
@@@@ -3098,7 +3098,7 @@@@
d268 1
a268 1
@@@@ -3177,7 +3177,7 @@@@
d277 1
a277 1
@@@@ -3204,7 +3204,7 @@@@
d286 1
a286 1
@@@@ -3344,7 +3344,7 @@@@
d295 1
a295 1
@@@@ -3594,7 +3594,7 @@@@
d304 1
a304 1
@@@@ -3606,7 +3606,7 @@@@
d313 1
a313 1
@@@@ -3631,7 +3631,7 @@@@
d322 1
a322 1
@@@@ -3770,7 +3770,7 @@@@
d331 1
a331 1
@@@@ -4394,7 +4394,7 @@@@
d340 1
a340 1
@@@@ -4543,7 +4543,7 @@@@
d349 1
a349 1
@@@@ -4659,7 +4659,7 @@@@
d358 1
a358 1
@@@@ -4698,12 +4698,12 @@@@
d373 1
a373 1
@@@@ -4717,12 +4717,12 @@@@
d388 1
a388 1
@@@@ -4739,11 +4739,11 @@@@
d402 1
a402 1
@@@@ -4760,11 +4760,11 @@@@
d416 1
a416 1
@@@@ -4795,7 +4795,7 @@@@
d425 1
a425 1
@@@@ -4825,7 +4825,7 @@@@
d434 1
a434 1
@@@@ -4844,7 +4844,7 @@@@
d443 1
a443 1
@@@@ -4931,14 +4931,14 @@@@
d462 1
a462 1
@@@@ -4994,7 +4994,7 @@@@
d471 1
a471 1
@@@@ -5239,13 +5239,13 @@@@
d488 1
a488 1
@@@@ -5260,13 +5260,13 @@@@
d504 1
a504 1
@@@@ -6055,10 +6055,10 @@@@
d517 1
a517 1
@@@@ -6069,7 +6069,7 @@@@
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 4
a4 222
--- pine/other.c.orig	Thu Jul 16 09:09:27 1998
+++ pine/other.c	Tue Jul 28 08:35:05 1998
@@@@ -51,16 +51,16 @@@@
 
 #define	BODY_LINES(X)	((X)->ttyo->screen_rows -HEADER_ROWS(X)-FOOTER_ROWS(X))
 
-#define	CONFIG_SCREEN_TITLE		"SETUP CONFIGURATION"
-#define	CONFIG_SCREEN_HELP_TITLE	"HELP FOR SETUP CONFIGURATION"
+#define	CONFIG_SCREEN_TITLE		"ҳ]w"
+#define	CONFIG_SCREEN_HELP_TITLE	"ҳ]wU"
 #define	R_SELD				'*'
-#define	EXIT_PMT "Commit changes (\"Yes\" replaces settings, \"No\" abandons changes)"
-static char *empty_val  = "Empty Value";
-static char *empty_val2 = "<Empty Value>";
+#define	EXIT_PMT "eX (\"O\" N]wA\"_\" )"
+static char *empty_val  = "Ū]w";
+static char *empty_val2 = "<Ū]w>";
 #define EMPTY_VAL_LEN     11
-static char *no_val     = "No Value Set";
+static char *no_val     = "|wq]w";
 #define NO_VAL_LEN        12
-static char *fixed_val  = "Value is Fixed";
+static char *fixed_val  = "]wȤwTw";
 
 typedef struct proto_conf_line {
     short   type,		                /* type of line treatment    */
@@@@ -311,9 +311,9 @@@@
 	    char prompt[50];
 
 	    sprintf(prompt,
-		"%s password to LOCK keyboard %s: ",
-		i ? "Retype" : "Enter",
-		i > 1 ? "(Yes, again) " : "");
+		"%swLKX %sG",
+		i ? "sJ" : "J",
+		i > 1 ? "(OAA@@) " : "");
 
 	    flags = OE_PASSWD;
 	    rc =  optionally_enter(pw, -FOOTER_ROWS(ps), 0, 30,
@@@@ -322,7 +322,7 @@@@
 	    if(rc == 3)
 	      help = help == NO_HELP ? h_kb_lock : NO_HELP;
 	    else if(rc == 1 || pw[0] == '\0'){
-		q_status_message(SM_ORDER, 0, 2, "Keyboard lock cancelled");
+		q_status_message(SM_ORDER, 0, 2, "Lw");
 		return(-1);
 	    }
 	    else if(rc != 4)
@@@@ -333,14 +333,14 @@@@
 	  strcpy(inpasswd, pw);
 	else if(strcmp(inpasswd, pw)){
 	    q_status_message(SM_ORDER, 0, 2,
-		"Mismatch with initial password: keyboard lock cancelled");
+		"MlKXšGLw");
 	    return(-1);
 	}
     }
 
-    if(want_to("Really lock keyboard with entered password", 'y', 'n',
+    if(want_to("TwHJKXwL", 'y', 'n',
 	       NO_HELP, WT_NORM) != 'y'){
-	q_status_message(SM_ORDER, 0, 2, "Keyboard lock cancelled");
+	q_status_message(SM_ORDER, 0, 2, "Lw");
 	return(-1);
     }
 
@@@@ -354,7 +354,7 @@@@
     while(strcmp(inpasswd, passwd)){
 	if(passwd[0])
 	  q_status_message(SM_ORDER | SM_DING, 3, 3,
-		     "Password to UNLOCK doesn't match password used to LOCK");
+		     "KX");
         
         help = NO_HELP;
         while(1){
@@@@ -362,7 +362,7 @@@@
 
 	    flags = OE_PASSWD | OE_DISALLOW_CANCEL;
 	    rc =  optionally_enter(passwd, -FOOTER_ROWS(ps), 0, 30,
-				   "Enter password to UNLOCK keyboard : ",NULL,
+				   "JѰwKXG",NULL,
 				   help, &flags);
 	    if(rc == 3) {
 		help = help == NO_HELP ? h_oe_keylock : NO_HELP;
@@@@ -377,7 +377,7 @@@@
     if(old_suspend)
       F_TURN_ON(F_CAN_SUSPEND, ps_global);
 
-    q_status_message(SM_ORDER, 0, 3, "Keyboard Unlocked");
+    q_status_message(SM_ORDER, 0, 3, "ѰLw");
     return(0);
 }
 
@@@@ -412,7 +412,7 @@@@
     PICO     pbuf;
 
     if(!signature_path(sigfile, sig_path, MAXPATH)){
-        q_status_message(SM_ORDER, 3, 4, "No signature file defined.");
+        q_status_message(SM_ORDER, 3, 4, "|wqñWɡC");
 	return;
     }
 
@@@@ -442,7 +442,7 @@@@
     pbuf.browse_help   = h_composer_browse;
     pbuf.attach_help   = h_composer_ctrl_j;
 
-    pbuf.pine_anchor   = set_titlebar("SIGNATURE EDITOR",
+    pbuf.pine_anchor   = set_titlebar("ñWɽs边",
 				      ps_global->mail_stream,
 				      ps_global->context_current,
 				      ps_global->cur_folder,
@@@@ -486,7 +486,7 @@@@
      */
     if(!(msgso = so_get(PicoText, NULL, EDIT_ACCESS))){
         q_status_message(SM_ORDER | SM_DING, 3, 4,
-			 "Error allocating space for signature file");
+			 "tmñWɪŶɵoͿ~");
 	dprint(1, (debugfile, "Can't alloc space for signature_edit"));
 	return;
     }
@@@@ -496,7 +496,7 @@@@
     if(can_access(sig_path, READ_ACCESS) == 0
        && !(tmpso = so_get(FileStar, sig_path, READ_ACCESS))){
 	char *problem = error_description(errno);
-	q_status_message2(SM_ORDER | SM_DING, 3, 3, "Error editing %s: %s",
+	q_status_message2(SM_ORDER | SM_DING, 3, 3, "s %s ɵoͿ~G%s",
 			  sig_path, problem ? problem : "<NULL>");
 	dprint(1, (debugfile, "signature_edit: can't open %s: %s", sig_path,
 		   problem ? problem : "<NULL>"));
@@@@ -508,7 +508,7 @@@@
 	gf_filter_init();		/* no filters needed */
 	if(errstr = gf_pipe(gc, pc)){
 	    q_status_message1(SM_ORDER | SM_DING, 3, 5,
-			      "Error reading signature \"%s\"", errstr);
+			      "sñWɮɵoͿ~ \"%s\"", errstr);
 	}
 
 	gf_clear_so_readc(tmpso);
@@@@ -547,7 +547,7 @@@@
 		gf_filter_init();		/* no filters needed */
 		if(errstr = gf_pipe(gc, pc)){
 		    q_status_message1(SM_ORDER | SM_DING, 3, 5,
-				      "Error writing signature \"%s\"",
+				      "gJñWɮɵoͿ~ \"%s\"",
 				      errstr);
 		}
 
@@@@ -557,7 +557,7 @@@@
 	    }
 	    else{
 		q_status_message1(SM_ORDER | SM_DING, 3, 3,
-				  "Error writing %s", sig_path);
+				  "gJ %s ɵoͿ~", sig_path);
 		dprint(1, (debugfile, "signature_edit: can't write %s",
 			   sig_path));
 	    }
@@@@ -581,8 +581,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}
     };
 
@@@@ -590,18 +590,18 @@@@
     fix_windsize(ps_global);
 
     while(1){
-	rv = radio_buttons("Exit editor and apply changes? ",
+	rv = radio_buttons("sîMΧܡH",
 			   -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;
 	}
     }
@@@@ -616,24 +616,24 @@@@
  *  * * * * *    Start of Config Screen Support Code   * * * * * 
  */
 
-#define PREV_MENU {"P", "Prev", {MC_PREVITEM, 1, {'p'}}, KS_NONE}
-#define NEXT_MENU {"N", "Next", {MC_NEXTITEM, 2, {'n','\t'}}, KS_NONE}
+#define PREV_MENU {"P", "e@@", {MC_PREVITEM, 1, {'p'}}, KS_NONE}
+#define NEXT_MENU {"N", "@@", {MC_NEXTITEM, 2, {'n','\t'}}, KS_NONE}
 #define EXIT_SETUP_MENU \
-	{"E", "Exit Setup", {MC_EXIT,1,{'e'}}, KS_EXITMODE}
+	{"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE}
 #define TOGGLE_MENU \
-	{"X", "[Set/Unset]", {MC_TOGGLE,3,{'x',ctrl('M'),ctrl('J')}}, KS_NONE}
+	{"X", "[]w/Ѱ]w]", {MC_TOGGLE,3,{'x',ctrl('M'),ctrl('J')}}, KS_NONE}
 
 static struct key config_text_keys[] = 
        {HELP_MENU,
 	NULL_MENU,
 	EXIT_SETUP_MENU,
-	{"C", "[Change Val]", {MC_EDIT,3,{'c',ctrl('M'),ctrl('J')}}, KS_NONE},
+	{"C", "[ܳ]w]", {MC_EDIT,3,{'c',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREV_MENU,
 	NEXT_MENU,
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
-	{"A", "Add Value", {MC_ADD,1,{'a'}}, KS_NONE},
-	{"D", "Delete Val", {MC_DELETE,1,{'d'}}, KS_NONE},
+	{"A", "sW]w", {MC_ADD,1,{'a'}}, KS_NONE},
+	{"D", "R]w", {MC_DELETE,1,{'d'}}, KS_NONE},
 	PRYNTTXT_MENU,
 	WHEREIS_MENU};
 INST_KEY_MENU(config_text_keymenu, config_text_keys);
@@@@ -657,7 +657,7 @@@@
d6 7
a12 6
 	NULL_MENU,
 	EXIT_SETUP_MENU,
-	{"*", "[Select]", {MC_CHOICE,3,{'*',ctrl('M'),ctrl('J')}}, KS_NONE},
+	{"*", "[]", {MC_CHOICE,3,{'*',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREV_MENU,
 	NEXT_MENU,
d14 19
a32 16
@@@@ -672,7 +672,7 @@@@
        {HELP_MENU,
 	NULL_MENU,
 	EXIT_SETUP_MENU,
-	{"C", "[Change]", {MC_TOGGLE,3,{'c',ctrl('M'),ctrl('J')}}, KS_NONE},
+	{"C", "[ק]", {MC_TOGGLE,3,{'c',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREV_MENU,
 	NEXT_MENU,
 	PREVPAGE_MENU,
@@@@ -696,7 +696,6 @@@@
 			 || (F) == F_DISABLE_DFLT_IN_BUG_RPT	\
 			 || (F) == F_DISABLE_ALARM		\
 			 || (F) == F_ALLOW_CHANGING_FROM	\
-			 || (F) == F_TCAP_WINS			\
 			 || (F) == F_QUELL_PARTIAL_FETCH	\
 			 || (F) == F_AGG_SEQ_COPY)
d34 2
a35 1
@@@@ -1377,14 +1376,14 @@@@
d37 4
a40 6
 	PRYNTTXT_MENU,
 	EXIT_SETUP_MENU,
-	{"S", "[Select]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}}, KS_NONE},
+	{"S", "[]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREV_MENU,
 	NEXT_MENU,
d43 3
a45 11
-	{"A", "Add Printer", {MC_ADD,1,{'a'}}, KS_NONE},
-	{"D", "DeletePrint", {MC_DELETE,1,{'d'}}, KS_NONE},
-	{"C", "Change", {MC_EDIT,1,{'c'}}, KS_NONE},
+	{"A", "sWL", {MC_ADD,1,{'a'}}, KS_NONE},
+	{"D", "RL", {MC_DELETE,1,{'d'}}, KS_NONE},
+	{"C", "ק", {MC_EDIT,1,{'c'}}, KS_NONE},
 	WHEREIS_MENU};
 INST_KEY_MENU(printer_edit_keymenu, printer_edit_keys);
 
@@@@ -1392,7 +1391,7 @@@@
        {HELP_MENU,
d47 3
a49 37
 	EXIT_SETUP_MENU,
-	{"S", "[Select]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}}, KS_NONE},
+	{"S", "[]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREV_MENU,
 	NEXT_MENU,
 	PREVPAGE_MENU,
@@@@ -1425,7 +1424,7 @@@@
     char *saved_printer;
     OPT_SCREEN_S screen;
 
-    if(fixed_var(&ps_global->vars[V_PRINTER], "change", "printer"))
+    if(fixed_var(&ps_global->vars[V_PRINTER], "ק", "L"))
       return;
 
     saved_printer = cpystr(ps->VAR_PRINTER);
@@@@ -1794,7 +1793,7 @@@@
 
     vsave = save_config_vars(ps);
     switch(conf_scroll_screen(ps, &screen, start_line,
-			      "SETUP PRINTER", "printer config ", 1)){
+			      "]wL", "printer config ", 1)){
       case 0:
 	break;
     
@@@@ -1835,8 +1834,8 @@@@
       fs_give((void **)def_printer_line);
 
     *def_printer_line = fs_get(36 + strlen(p) + 1);
-    sprintf(*def_printer_line, "Default printer currently %s%s%s",
-	set ? "set to \"" : "unset", set ? p : "", set ? "\"." : "."); 
+    sprintf(*def_printer_line, "w]Lثe%s%s%s",
+	set ? "]w \"" : "]w", set ? p : "", set ? "\"." : "."); 
 
     fs_give((void **)&nick);
     fs_give((void **)&cmd);
@@@@ -1846,7 +1845,7 @@@@
 static struct key flag_keys[] = 
d52 2
a53 11
-        {"E", "Exit Flags", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+        {"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
         TOGGLE_MENU,
 	PREV_MENU,
 	NEXT_MENU,
@@@@ -2000,9 +1999,9 @@@@
 
 static struct key addr_select_keys[] = 
        {HELP_MENU,
-        {"E", "ExitSelect", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+        {"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
a54 8
-        {"S", "[Select]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}}, KS_NONE},
+        {"S", "[]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREV_MENU,
 	NEXT_MENU,
 	PREVPAGE_MENU,
@@@@ -2016,29 +2015,29 @@@@
 static struct key addr_select_with_goback_keys[] = 
        {HELP_MENU,
a55 8
-        {"<", "AddbkList", {MC_ADDRBOOK,2,{'<',','}}, KS_NONE},
-        {"S", "[Select]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}}, KS_NONE},
+        {"<", "a}ïC", {MC_ADDRBOOK,2,{'<',','}}, KS_NONE},
+        {"S", "[]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREV_MENU,
 	NEXT_MENU,
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
d57 7
a63 5
 	NULL_MENU,
-        {"E", "ExitSelect", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+        {"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
 	WHEREIS_MENU};
 INST_KEY_MENU(addr_s_km_with_goback, addr_select_with_goback_keys);
a64 41
 static struct key addr_select_with_view_keys[] = 
        {HELP_MENU,
 	NULL_MENU,
-        {"<", "AddbkList", {MC_ADDRBOOK,2,{'<',','}}, KS_NONE},
-        {">", "[View]",
+        {"<", "a}ïC", {MC_ADDRBOOK,2,{'<',','}}, KS_NONE},
+        {">", "[˵]",
 	   {MC_VIEW_TEXT,5,{'v','>','.',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREV_MENU,
 	NEXT_MENU,
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
-        {"C", "ComposeTo", {MC_COMPOSE,1,{'c'}}, KS_COMPOSER},
+        {"C", "s", {MC_COMPOSE,1,{'c'}}, KS_COMPOSER},
 	FWDEMAIL_MENU,
 	SAVE_MENU,
 	WHEREIS_MENU};
@@@@ -2047,7 +2046,7 @@@@
 static struct key addr_select_exit_keys[] = 
        {NULL_MENU,
 	NULL_MENU,
-        {"E", "[Exit]", {MC_EXIT,3,{'e',ctrl('M'),ctrl('J')}},
+        {"E", "[}]", {MC_EXIT,3,{'e',ctrl('M'),ctrl('J')}},
 	   KS_EXITMODE},
 	NULL_MENU,
 	NULL_MENU,
@@@@ -2063,7 +2062,7 @@@@
 static struct key addr_select_goback_keys[] = 
        {NULL_MENU,
 	NULL_MENU,
-        {"E", "[Exit]", {MC_ADDRBOOK,3,{'e',ctrl('M'),ctrl('J')}},
+        {"E", "[}]", {MC_ADDRBOOK,3,{'e',ctrl('M'),ctrl('J')}},
 	   KS_EXITMODE},
 	NULL_MENU,
 	NULL_MENU,
@@@@ -2404,7 +2403,7 @@@@
 	  sprintf(ee+2, "%s, No Matches Returned",
 		  ldap_err2string(wp_err->ldap_errno));
 	else
-	    strcat(ee, "No Matches");
+	    strcat(ee, "SŦX");
d66 8
a73 8
 	strcat(ee, " -- Choose Exit ]");
 	ctmpa->value      = cpystr(ee);
@@@@ -2498,7 +2497,7 @@@@
       case MC_CHOICE :
 	if(flags & CF_PRIVATE){
 	    q_status_message(SM_ORDER | SM_DING, 0, 3,
-     "No email address available for this entry; choose another or ExitSelect");
+     "Lkw惡oqlla}FпܨL}");
d75 19
a93 49
 	else if(some_selectable){
 	    (*cl)->d.a.ac->selected_ld    = (*cl)->d.a.ld;
@@@@ -2561,15 +2560,15 @@@@
 static struct key direct_config_keys[] = 
        {HELP_MENU,
 	NULL_MENU,
-        {"E", "Exit Setup", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
-	{"C", "[Change]", {MC_EDIT,3,{'c',ctrl('M'),ctrl('J')}}, KS_NONE},
-	{"P", "PrevDir", {MC_PREVITEM, 1, {'p'}}, KS_NONE},
-	{"N", "NextDir", {MC_NEXTITEM, 2, {'n', TAB}}, KS_NONE},
+        {"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+	{"C", "[ק]", {MC_EDIT,3,{'c',ctrl('M'),ctrl('J')}}, KS_NONE},
+	{"P", "e@@ؿ", {MC_PREVITEM, 1, {'p'}}, KS_NONE},
+	{"N", "@@ؿ", {MC_NEXTITEM, 2, {'n', TAB}}, KS_NONE},
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
-	{"A", "Add Dir", {MC_ADD,1,{'a'}}, KS_NONE},
-	{"D", "Del Dir", {MC_DELETE,1,{'d'}}, KS_NONE},
-	{"$", "Shuffle", {MC_SHUFFLE,1,{'$'}}, KS_NONE},
+	{"A", "sWؿ", {MC_ADD,1,{'a'}}, KS_NONE},
+	{"D", "Rؿ", {MC_DELETE,1,{'d'}}, KS_NONE},
+	{"$", "", {MC_SHUFFLE,1,{'$'}}, KS_NONE},
 	WHEREIS_MENU};
 INST_KEY_MENU(dir_conf_km, direct_config_keys);
 
@@@@ -2655,7 +2654,7 @@@@
      */
     if(!ps->VAR_LDAP_SERVERS || !ps->VAR_LDAP_SERVERS[0] ||
        !ps->VAR_LDAP_SERVERS[0][0]){
-	if(!fixed_var(&ps->vars[V_LDAP_SERVERS], "modify", "directory list")){
+	if(!fixed_var(&ps->vars[V_LDAP_SERVERS], "ק", "a}C")){
 	    unsigned flags = 0;
 
 	    opt_screen = &screen;
@@@@ -2665,7 +2664,7 @@@@
 #endif /* notdef */
     
     (void)conf_scroll_screen(ps, &screen, first_line,
-			     "SETUP DIRECTORY SERVERS", "servers ", 1);
+			     "]wa}A", "servers ", 1);
     ps->mangled_screen = 1;
 }
 
@@@@ -2685,20 +2684,20 @@@@
       case MC_DELETE :
 	if(first_one)
 	  q_status_message(SM_ORDER|SM_DING, 0, 3,
-			   "Nothing to Delete, use Add");
+			   "SiѧRءAХηsW");
d95 1
a95 1
 	  dir_config_del(ps, cl);
d97 35
a131 1
 	break;
d133 32
a164 4
       case MC_ADD :
-	if(!fixed_var((*cl)->var, NULL, "directory list"))
+	if(!fixed_var((*cl)->var, NULL, "a}C"))
 	  dir_config_add(ps, cl);
d166 14
a179 23
 	break;
 
       case MC_EDIT :
-	if(!fixed_var((*cl)->var, NULL, "directory list")){
+	if(!fixed_var((*cl)->var, NULL, "a}C")){
 	    if(first_one)
 	      dir_config_add(ps, cl);
 	    else
@@@@ -2708,10 +2707,10 @@@@
 	break;
 
       case MC_SHUFFLE :
-	if(!fixed_var((*cl)->var, NULL, "directory list")){
+	if(!fixed_var((*cl)->var, NULL, "a}C")){
 	    if(first_one)
 	      q_status_message(SM_ORDER|SM_DING, 0, 3,
-			       "Nothing to Shuffle, use Add");
+			       "Siѭ㪺ءAХηsW");
 	    else
 	      dir_config_shuffle(ps, cl);
 	}
@@@@ -2840,7 +2839,7 @@@@
 	    write_pinerc(ps);
d182 7
a188 2
-	  q_status_message(SM_ORDER, 0, 3, "Add cancelled, no server name");
+	  q_status_message(SM_ORDER, 0, 3, "SAW١AsW");
d190 5
a194 3
 
     free_ldap_server_info(&info);
@@@@ -2870,7 +2869,7 @@@@
d196 2
a197 5
     if(cnt < 2){
 	q_status_message(SM_ORDER, 0, 3,
-	 "Shuffle only makes sense when there is more than one server defined");
+	 "ȦbwqFhӦAA~o@@");
 	return;
d199 10
a208 64
 
@@@@ -2881,12 +2880,12 @@@@
     opts[i].ch      = 'u';
     opts[i].rval    = 'u';
     opts[i].name    = "U";
-    opts[i++].label = "Up";
+    opts[i++].label = "W";
 
     opts[i].ch      = 'd';
     opts[i].rval    = 'd';
     opts[i].name    = "D";
-    opts[i++].label = "Down";
+    opts[i++].label = "U";
 
     opts[i].ch = -1;
     deefault = 'u';
@@@@ -2898,11 +2897,11 @@@@
     else if(current_num == cnt - 1)		/* no down */
       opts[1].ch = -2;
 
-    sprintf(tmp, "Shuffle \"%s\" %s%s%s ? ",
+    sprintf(tmp, " \"%s\" %s%s%s ? ",
 	    (*cl)->value,
-	    (opts[0].ch != -2) ? "UP" : "",
+	    (opts[0].ch != -2) ? "W" : "",
 	    (opts[0].ch != -2 && opts[1].ch != -2) ? " or " : "",
-	    (opts[1].ch != -2) ? "DOWN" : "");
+	    (opts[1].ch != -2) ? "U" : "");
     help = (opts[0].ch == -2) ? h_dir_shuf_down
 			      : (opts[1].ch == -2) ? h_dir_shuf_up
 						   : h_dir_shuf;
@@@@ -2912,7 +2911,7 @@@@
 
     switch(rv){
       case 'x':
-	q_status_message(SM_ORDER, 0, 3, "Shuffle cancelled");
+	q_status_message(SM_ORDER, 0, 3, "");
 	return;
 
       case 'u':
@@@@ -2950,7 +2949,7 @@@@
     free_list_array(&new_list);
     if(j){
 	q_status_message(SM_ORDER, 0, 3,
-			 "Shuffle cancelled: couldn't save configuration file");
+			 "GLksJ]w");
 	set_current_val((*cl)->var, TRUE, FALSE);
 	return;
     }
@@@@ -3002,10 +3001,10 @@@@
 	info = break_up_ldap_server(raw_server);
 
 	if(strcmp((*cl)->var->current_val.l[(*cl)->varmem], raw_server) == 0)
-	  q_status_message(SM_ORDER, 0, 3, "No change, cancelled");
+	  q_status_message(SM_ORDER, 0, 3, "SܡA");
 	else if(!(info && info->serv && *info->serv))
 	  q_status_message(SM_ORDER, 0, 3,
-	      "Change cancelled, use Delete if you want to remove this server");
+	      "wܡApRAAХΧR");
 	else{
 	    char   tmp[900];
 	    char  *subtitle;
@@@@ -3740,7 +3739,7 @@@@
 	}
d210 2
a211 33
 	  q_status_message(SM_ORDER, 3, 3,
-			   "Can't delete sys-admin defined value");
+			   "LkRtκ޲zwq]wȡC");
     }
     else{
 	int cnt, ans = 0;
@@@@ -3763,8 +3762,8 @@@@
 	 */
 	if(!(*cl)->var->user_val.l && cnt > 1){
 	    static ESCKEY_S opts[] = {
-		{'i', 'i', "I", "Ignore All"},
-		{'r', 'r', "R", "Remove One"},
+		{'i', 'i', "I", ""},
+		{'r', 'r', "R", "@@"},
 		{-1, 0, NULL, NULL}};
 	    ans = radio_buttons(
 	"Ignore all default directory servers or just remove this one ? ",
@@@@ -3870,7 +3869,7 @@@@
 		    CONF_S   *first_line = NULL;
 
 		    q_status_message(SM_ORDER, 0, 3,
-				 "Reverting to default directory server");
+				 "^_ܹw]a}A");
 		    dir_init_display(ps, cl, servers,
 				   &ps->vars[V_LDAP_SERVERS], &first_line);
 		    *cl = first_line;
@@@@ -3910,7 +3909,7 @@@@
 	    }
 	}
 	else
-	  q_status_message(SM_ORDER, 0, 3, "Server not deleted");
+	  q_status_message(SM_ORDER, 0, 3, "AQR");
     }
d213 1
a213 9
     if(rv == 1){
@@@@ -4416,7 +4415,7 @@@@
 		ps->mangled_screen = 1;
 	    }
 	    else
-	      q_status_message(SM_ORDER,0,3,"No help yet!");
+	      q_status_message(SM_ORDER,0,3,"U|sbI");
 
 	    break;
d215 50
a264 6
@@@@ -4473,7 +4472,7 @@@@
 		if(i)
 		  config_scroll_up(i);
 		else
-		  q_status_message(SM_ORDER,0,1, "Already at end of screen");
+		  q_status_message(SM_ORDER,0,1, "wgbeF");
d268 6
a273 6
@@@@ -4497,7 +4496,7 @@@@
 	    }
 	    else
 	      q_status_message(SM_ORDER, 0, 1,
-			       "Already at start of screen");
+			       "wgbe_lF");
d275 9
a283 1
 	    break;
d285 2
a286 1
@@@@ -4540,7 +4539,7 @@@@
d288 14
a301 65
 		    if(ctmpa == screen->current){
 			q_status_message(SM_ORDER,0,1,
-					 "Already at end of screen");
+					 "wgbeF");
 			goto no_down;
 		    }
 
@@@@ -4571,7 +4570,7 @@@@
 	    if(ctmpa){
 		if(ctmpa == screen->current)
 		  q_status_message(SM_ORDER, 0, 1,
-				 "Already at start of screen");
+				 "wgbe_lF");
 
 		screen->current = ctmpa;
 	    }
@@@@ -4651,13 +4650,13 @@@@
 	     HelpType help;
 	     static ESCKEY_S ekey[] = {
 		{0, 0, "", ""},
-		{ctrl('Y'), 10, "^Y", "Top"},
-		{ctrl('V'), 11, "^V", "Bottom"},
+		{ctrl('Y'), 10, "^Y", ""},
+		{ctrl('V'), 11, "^V", ""},
 		{-1, 0, NULL, NULL}};
 
 	     ps->mangled_footer = 1;
 	     buf[0] = '\0';
-	     sprintf(tmp, "Word to find %s%s%s: ",
+	     sprintf(tmp, "jMr %s%s%s: ",
 		     (last[0]) ? "[" : "",
 		     (last[0]) ? last : "",
 		     (last[0]) ? "]" : "");
@@@@ -4779,7 +4778,7 @@@@
 		 result = "Searched to bottom";
 	     }
 	     else
-	       result = "WhereIs cancelled";
+	       result = "jM";
 
 	     if((found & FOUND_IT) && ctmpa){
 		 strcpy(last, buf);
@@@@ -4798,7 +4797,7 @@@@
 		 screen->current = ctmpa;
 	     }
 
-	     q_status_message(SM_ORDER,0,3,result ? result : "Word not found");
+	     q_status_message(SM_ORDER,0,3,result ? result : "䤣Ӧr");
 	    }
 
 	    break;
@@@@ -4813,10 +4812,10 @@@@
 	    if(edit_config
 	       && (ps_global->restricted || ps_global->readonly_pinerc)){
 		q_status_message1(SM_ORDER, 0, 3,
-		     "%s can't change options or settings",
-		     ps_global->restricted ? "Pine demo"
-					   : "Config file not changeable,");
-		if(cmd == MC_EXIT){
+		     "%sLkܿﶵγ]w",
+		     ps_global->restricted ? "Pine iܪ"
+					   : "]wɵLkܡA");
+		if(cmd == MC_EXIT || cmd == KEY_LEFT){
 		    retval = 0;
 		    done++;
d303 2
a304 47
@@@@ -4831,9 +4830,9 @@@@
 		    &screen->current, flags)){
 		  case -1:
 		    q_status_message2(SM_ORDER, 0, 2,
-		      "Command \"%s\" not defined here.%s",
+		      "RO \"%s\" bwqC%s",
 		      pretty_command(ch),
-		      F_ON(F_BLANK_KEYMENU,ps) ? "" : "  See key menu below.");
+		      F_ON(F_BLANK_KEYMENU,ps) ? "" : "аѦҤUCMC");
 		    break;
 
 		  case 0:
@@@@ -5370,11 +5369,11 @@@@
 	ekey[1].ch    = ctrl('P');
 	ekey[1].rval  = ctrl('P');
 	ekey[1].name  = "^P";
-	ekey[1].label = "Decrease";
+	ekey[1].label = "";
 	ekey[2].ch    = ctrl('N');
 	ekey[2].rval  = ctrl('N');
 	ekey[2].name  = "^N";
-	ekey[2].label = "Increase";
+	ekey[2].label = "W[";
 	ekey[3].ch    = KEY_DOWN;
 	ekey[3].rval  = ctrl('P');
 	ekey[3].name  = "";
@@@@ -5389,12 +5388,12 @@@@
     sval[0] = '\0';
     switch(cmd){
       case MC_ADD:				/* add to list */
-	if(fixed_var((*cl)->var, "add to", NULL)){
+	if(fixed_var((*cl)->var, "sW", NULL)){
 	    break;
 	}
 	else if(!(*cl)->var->is_list && (*cl)->var->user_val.p){
 	    q_status_message(SM_ORDER, 3, 3,
-			    "Only single value allowed.  Use \"Change\".");
+			    "Ȥ\\@@]wȡCХ \"Change\".");
 	}
 	else{
 	    int maxwidth =min(80,ps->ttyo->screen_cols) - 15;
@@@@ -5418,7 +5417,7 @@@@
 		}
 
 		sprintf(prompt,
-		    "Enter text to insert before \"%.*s\": ",k,tmpval);
+		    "Jb \"%.*s\" erG",k,tmpval);
d306 5
a310 43
 	    else if((*cl)->var->is_list
 		    && !(*cl)->var->user_val.l
@@@@ -5427,13 +5426,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]ȡH");
 		switch(radio_buttons(prompt, -FOOTER_ROWS(ps), ekey, 'a', 'x',
 				     h_config_replace_add, RB_NORM)){
 		  case 'a':
@@@@ -5447,25 +5446,25 @@@@
 		    }
 
 add_text:
-		    sprintf(prompt, "Enter the %stext to be added : ",
-			flags&CF_NUMBER ? "numeric " : "");
+		    sprintf(prompt, "JQ[J%srG",
+			flags&CF_NUMBER ? " " : "");
 		    break;
 		    
 		  case 'r':
 replace_text:
-		    sprintf(prompt, "Enter the %sreplacement text : ",
-			flags&CF_NUMBER ? "numeric " : "");
+		    sprintf(prompt, "JQN%srG",
+			flags&CF_NUMBER ? " " : "");
 		    break;
 		    
 		  case 'x':
 		    i = 1;
-		    q_status_message(SM_ORDER,0,3,"Add cancelled");
+		    q_status_message(SM_ORDER,0,3,"sW");
 		    break;
 		}
a311 83
 	    else
-	      sprintf(prompt, "Enter the %stext to be added : ",
-		    flags&CF_NUMBER ? "numeric " : "");
+	      sprintf(prompt, "JQ[J%srG",
+		    flags&CF_NUMBER ? " " : "");
 
 	    ps->mangled_footer = 1;
 
@@@@ -5482,7 +5481,7 @@@@
 		    ekey[0].ch    = ctrl('W');
 		    ekey[0].rval  = 5;
 		    ekey[0].name  = "^W";
-		    ekey[0].label = after ? "InsertBefore" : "InsertAfter";
+		    ekey[0].label = after ? "be" : "b᭱";
 		    ekey[1].ch    = -1;
 		}
 		else if(!(flags&CF_NUMBER))
@@@@ -5536,7 +5535,7 @@@@
 			    }
 			    else{
 				q_status_message1(SM_ORDER, 0, 3,
-					 "Can't add %s to list", empty_val);
+					 "LkN %s [ܦC", empty_val);
 				rv = ps->mangled_body = 0;
 			    }
 
@@@@ -5544,7 +5543,7 @@@@
 			}
 			else{
 			    q_status_message1(SM_ORDER, 0, 3,
-					 "Can't add %s to list", empty_val);
+					 "LkN %s [ܦC", empty_val);
 			}
 		    }
 		    else{
@@@@ -5552,7 +5551,7 @@@@
 			  && !(isdigit((unsigned char)sval[0])
 			       || sval[0] == '-' || sval[0] == '+')){
 			    q_status_message(SM_ORDER,3,3,
-				  "Entry must be numeric");
+				  "ӶإOƦr");
 			    i = 3; /* to keep loop going */
 			    continue;
 			}
@@@@ -5565,7 +5564,7 @@@@
 		    }
 		}
 		else if(i == 1){
-		    q_status_message(SM_ORDER,0,3,"Add cancelled");
+		    q_status_message(SM_ORDER,0,3,"sW");
 		}
 		else if(i == 3){
 		    help = help == NO_HELP ? h_config_add : NO_HELP;
@@@@ -5588,8 +5587,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')){
@@@@ -5609,7 +5608,7 @@@@
 			 */
 			if(++repeat_key > 0){
 			    q_status_message1(SM_ORDER,3,3,
-				"Minimum value is %s", comatose(lowrange));
+				"̤pȬO %s", comatose(lowrange));
 			    repeat_key = -5;
 			}
 		    }
@@@@ -5633,7 +5632,7 @@@@
 		    if(numval == hirange){
 			if(++repeat_key > 0){
 			    q_status_message1(SM_ORDER,3,3,
-				"Maximum value is %s", comatose(hirange));
+				"̤jȬO %s", comatose(hirange));
 			    repeat_key = -5;
 			}
 		    }
@@@@ -5686,7 +5685,7 @@@@
d313 6
a318 29
 	else if(((*cl)->var->is_list && !(*cl)->var->user_val.l)
 		|| (!(*cl)->var->is_list && !(*cl)->var->user_val.p)){
-	    q_status_message(SM_ORDER, 0, 3, "No set value to delete");
+	    q_status_message(SM_ORDER, 0, 3, "SiѧR]w");
 	}
 	else{
 	    if((*cl)->var->is_fixed)
@@@@ -5702,7 +5701,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)
@@@@ -5710,8 +5710,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, WT_FLUSH_IN) == 'y'){
@@@@ -5726,7 +5725,7 @@@@
 		}
a319 3
 	    else
-	      q_status_message(SM_ORDER, 0, 3, "Value not deleted");
+	      q_status_message(SM_ORDER, 0, 3, "]wȥQR");
d322 7
a328 9
 	break;
@@@@ -5855,7 +5854,7 @@@@
 			  && !(isdigit((unsigned char)sval[0])
 			       || sval[0] == '-' || sval[0] == '+')){
 			    q_status_message(SM_ORDER,3,3,
-				  "Entry must be numeric");
+				  "ӶإOƦr");
 			    continue;
 			}
d330 2
a331 45
@@@@ -5869,7 +5868,7 @@@@
 		    }
 		}
 		else if(i == 1){
-		    q_status_message(SM_ORDER,0,3,"Change cancelled");
+		    q_status_message(SM_ORDER,0,3,"ק");
 		}
 		else if(i == 3){
 		    help = help == NO_HELP ? h_config_change : NO_HELP;
@@@@ -5887,7 +5886,7 @@@@
 			 */
 			if(++repeat_key > 0){
 			    q_status_message1(SM_ORDER,3,3,
-				"Minimum value is %s", comatose(lowrange));
+				"̤pȬO %s", comatose(lowrange));
 			    repeat_key = -5;
 			}
 		    }
@@@@ -5903,7 +5902,7 @@@@
 		    if(numval == hirange){
 			if(++repeat_key > 0){
 			    q_status_message1(SM_ORDER,3,3,
-				"Maximum value is %s", comatose(hirange));
+				"̤jȬO %s", comatose(hirange));
 			    repeat_key = -5;
 			}
 		    }
@@@@ -5990,15 +5989,15 @@@@
     if(flags & CF_CHANGES){
       switch(want_to(EXIT_PMT, 'y', 'x', h_config_undo, WT_FLUSH_IN)){
 	case 'y':
-	  q_status_message1(SM_ORDER,0,3,"%s changes saved", cmd);
+	  q_status_message1(SM_ORDER,0,3,"%s ܤws", cmd);
 	  return(2);
 
 	case 'n':
-	  q_status_message1(SM_ORDER,3,5,"No %s changes saved", cmd);
+	  q_status_message1(SM_ORDER,3,5,"%s ܥs", cmd);
 	  return(10);
 
 	case 'x':  /* ^C */
-	  q_status_message(SM_ORDER,3,5,"Changes not yet saved");
+	  q_status_message(SM_ORDER,3,5,"ܩ|Qs");
 	  return(0);
       }
a332 8
@@@@ -6290,7 +6289,7 @@@@
 	       && want_to("Delete old unused personal option setting",
 			  'y', 'n', NO_HELP, WT_FLUSH_IN) == 'y'){
 		fs_give((void **)&(*cl)->var->user_val.p);
-		q_status_message(SM_ORDER, 0, 3, "Deleted");
+		q_status_message(SM_ORDER, 0, 3, "wR");
 		rv = 1;
 	    }
d334 32
a365 7
@@@@ -6429,7 +6428,7 @@@@
 	       && want_to("Delete old unused personal option setting",
 			  'y', 'n', NO_HELP, WT_FLUSH_IN) == 'y'){
 		fs_give((void **)&(*cl)->var->user_val.p);
-		q_status_message(SM_ORDER, 0, 3, "Deleted");
+		q_status_message(SM_ORDER, 0, 3, "wR");
 		rv = 1;
d367 28
a394 12
 
@@@@ -6519,15 +6518,15 @@@@
 			fs_give((void **)&q);
 		    }
 
-		    q_status_message3(SM_ORDER,0,3, "Default printer %s%s%s",
-			p ? "set to \"" : "unset", p ? p : "", p ? "\"" : ""); 
+		    q_status_message3(SM_ORDER,0,3, "w]Lثe%s%s%s",
+			p ? "]w \"" : "]", p ? p : "", p ? "\"" : ""); 
 
 		    if(p)
 		      fs_give((void **)&p);
d397 4
a400 3
 		  q_status_message(SM_ORDER,3,5,
-			"Trouble setting default printer");
+			"Dw]L");
d402 7
a408 8
 		retval = 1;
 	    }
@@@@ -6538,11 +6537,11 @@@@
 		    set_variable(V_PERSONAL_PRINT_CATEGORY, 
 			comatose(ps->printer_category), 0);
 		    q_status_message1(SM_ORDER,0,3,
-			"Default printer set to \"%s\"", ANSI_PRINTER);
+			"w]L]w \"%s\"", ANSI_PRINTER);
d411 3
a413 5
 		  q_status_message(SM_ORDER,3,5,
-			"Trouble setting default printer");
+			"Dw]L");
 
 		retval = 1;
a414 11
@@@@ -6557,11 +6556,11 @@@@
 			set_variable(V_PERSONAL_PRINT_CATEGORY, 
 			    comatose(ps->printer_category), 0);
 			q_status_message1(SM_ORDER,0,3,
-			    "Default printer set to \"%s\"", aname);
+			    "w]L]w \"%s\"", aname);
 		    }
 		    else
 		      q_status_message(SM_ORDER,3,5,
-			    "Trouble setting default printer");
+			    "Dw]L");
d416 1
a416 30
 		    retval = 1;
 		}
@@@@ -6611,7 +6610,7 @@@@
     switch(cmd){
       case MC_ADD:				/* add to list */
 	sval[0] = '\0';
-	if(!fixed_var((*cl)->var, "add to", NULL)){
+	if(!fixed_var((*cl)->var, "sW", NULL)){
 
 	    if((*cl)->var->user_val.l && (*cl)->value){
 		strcpy(prompt, "Enter printer name : ");
@@@@ -6643,17 +6642,17 @@@@
 		    ltmp[k + 1] = ltmp[k] = NULL;
 
 add_text:
-		    strcpy(prompt, "Enter name of printer to be added : ");
+		    strcpy(prompt, "sWLW١G");
 		    break;
 		    
 		  case 'r':
 replace_text:
 		    strcpy(prompt,
-			"Enter the name for replacement printer : ");
+			"NLW١G");
 		    break;
 		    
 		  case 'x':
-		    q_status_message(SM_ORDER,0,3,"Add cancelled");
+		    q_status_message(SM_ORDER,0,3,"sW");
 		    break;
d419 3
a421 2
@@@@ -6661,7 +6660,7 @@@@
 		  break;
a422 3
 	    else
-	      strcpy(prompt, "Enter name of printer to be added : ");
+	      strcpy(prompt, "sWLW١G");
d424 2
a425 9
 	    ps->mangled_footer = 1;
 	    help = NO_HELP;
@@@@ -6673,7 +6672,7 @@@@
 		    ekey[0].ch    = ctrl('W');
 		    ekey[0].rval  = 5;
 		    ekey[0].name  = "^W";
-		    ekey[0].label = after ? "InsertBefore" : "InsertAfter";
+		    ekey[0].label = after ? "be" : "b";
 		    ekey[1].ch    = -1;
d427 4
a430 57
 		else
@@@@ -6690,7 +6689,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,"sW");
 		}
 		else if(i == 3){
 		    help = (help == NO_HELP) ? h_config_insert_after : NO_HELP;
@@@@ -6744,7 +6743,7 @@@@
 			     * Don't allow input of multiple entries at once.
 			     */
 			    q_status_message(SM_ORDER,3,5,
-				"No commas allowed in command");
+				"ROir");
 			    i = 2;
 			    continue;
 			}
@@@@ -6759,10 +6758,10 @@@@
 		    }
 		    else
 		      q_status_message1(SM_ORDER, 0, 3,
-					 "Can't add %s to list", empty_val);
+					 "LksW %s ܦC", empty_val);
 		}
 		else if(i == 1){
-		    q_status_message(SM_ORDER,0,3,"Add cancelled");
+		    q_status_message(SM_ORDER,0,3,"sW");
 		}
 		else if(i == 3){
 		    help = help == NO_HELP ? h_config_print_cmd : NO_HELP;
@@@@ -6800,19 +6799,19 @@@@
 	    }
 	}
 	else if(!(*cl)->var->user_val.l){
-	    q_status_message(SM_ORDER, 0, 3, "No set value to delete");
+	    q_status_message(SM_ORDER, 0, 3, "S]wȾDR");
 	}
 	else{
 	    if((*cl)->var->is_fixed){
 		parse_printer((*cl)->var->user_val.l[(*cl)->varmem],
 		    &nick, &p, NULL, NULL, NULL, NULL);
-	        sprintf(prompt, "Delete (unused) printer %.30s ",
+	        sprintf(prompt, "R (ϥΪ) L %.30s ",
 		    *nick ? nick : (!*p) ? empty_val2 : p);
 		fs_give((void **)&nick);
 		fs_give((void **)&p);
 	    }
 	    else
-	      sprintf(prompt, "Really delete item %.20s from printer list ",
+	      sprintf(prompt, "TwۦLCR %.20s",
 		    int2string((*cl)->varmem + 1));
 
 	    ps->mangled_footer = 1;
@@@@ -6822,7 +6821,7 @@@@
 		config_del_list_item(cl, &newval);
a431 4
 	    else
-	      q_status_message(SM_ORDER, 0, 3, "Printer not deleted");
+	      q_status_message(SM_ORDER, 0, 3, "LQR");
 	}
d433 2
a434 100
 	break;
@@@@ -6833,7 +6832,7 @@@@
 	  && !strucmp(ps->VAR_PRINTER,(*cl)->var->current_val.l[(*cl)->varmem]))
 	    changing_selected = 1;
 
-	if(fixed_var((*cl)->var, NULL, "printer"))
+	if(fixed_var((*cl)->var, NULL, "L"))
 	  break;
 	else if(!(*cl)->var->user_val.l && (*cl)->var->current_val.l)
 	  goto replace_text;
@@@@ -6845,22 +6844,22 @@@@
 	    ekey[0].ch    = 'n';
 	    ekey[0].rval  = 'n';
 	    ekey[0].name  = "N";
-	    ekey[0].label = "Name";
+	    ekey[0].label = "W";
 	    ekey[1].ch    = 'c';
 	    ekey[1].rval  = 'c';
 	    ekey[1].name  = "C";
-	    ekey[1].label = "Command";
+	    ekey[1].label = "RO";
 	    ekey[2].ch    = 'o';
 	    ekey[2].rval  = 'o';
 	    ekey[2].name  = "O";
-	    ekey[2].label = "Options";
+	    ekey[2].label = "ﶵ";
 	    ekey[3].ch    = -1;
-	    strcpy(prompt, "Change Name or Command or Options ? ");
+	    strcpy(prompt, "קW١BROοﶵH");
 	    i = radio_buttons(prompt, -FOOTER_ROWS(ps), ekey, 'c', 'x',
 			      h_config_print_name_cmd, RB_NORM);
 
 	    if(i == 'x'){
-		q_status_message(SM_ORDER,0,3,"Change cancelled");
+		q_status_message(SM_ORDER,0,3,"ק");
 		break;
 	    } 
 	    else if(i == 'c'){
@@@@ -6869,7 +6868,7 @@@@
 		parse_printer((*cl)->var->user_val.l[(*cl)->varmem],
 		    NULL, &p, NULL, NULL, NULL, &all_but_cmd);
 		
-		strcpy(prompt, "Change command : ");
+		strcpy(prompt, "קROG");
 		strcpy(sval, p ? p : "");
 		fs_give((void **)&p);
 
@@@@ -6908,12 +6907,12 @@@@
 			     * Don't allow input of multiple entries at once.
 			     */
 			    q_status_message(SM_ORDER,3,5,
-				"No commas allowed in command");
+				"ROir");
 			    continue;
 			}
 		    }
 		    else if(i == 1){
-			q_status_message(SM_ORDER,0,3,"Change cancelled");
+			q_status_message(SM_ORDER,0,3,"ק");
 		    }
 		    else if(i == 3){
 			help = help == NO_HELP ? h_config_change : NO_HELP;
@@@@ -6932,7 +6931,7 @@@@
 		parse_printer((*cl)->var->user_val.l[(*cl)->varmem],
 		    &p, NULL, NULL, NULL, &all_but_nick, NULL);
 		
-		strcpy(prompt, "Change name : ");
+		strcpy(prompt, "קW١G");
 		strcpy(name, p ? p : "");
 		fs_give((void **)&p);
 
@@@@ -6962,7 +6961,7 @@@@
 			newval = &(*cl)->value;
 		    }
 		    else if(i == 1){
-			q_status_message(SM_ORDER,0,3,"Change cancelled");
+			q_status_message(SM_ORDER,0,3,"ק");
 		    }
 		    else if(i == 3){
 			help = help == NO_HELP ? h_config_change : NO_HELP;
@@@@ -6983,18 +6982,18 @@@@
 		ekey[0].ch    = 'i';
 		ekey[0].rval  = 'i';
 		ekey[0].name  = "I";
-		ekey[0].label = "Init";
+		ekey[0].label = "l";
 		ekey[1].ch    = 't';
 		ekey[1].rval  = 't';
 		ekey[1].name  = "T";
-		ekey[1].label = "Trailer";
+		ekey[1].label = "";
 		ekey[2].ch    = -1;
-		strcpy(prompt, "Change Init string or Trailer string ? ");
+		strcpy(prompt, "קlεrH");
 		j = radio_buttons(prompt, -FOOTER_ROWS(ps), ekey, 'i', 'x',
 				  h_config_print_opt_choice, RB_NORM);
 
 		if(j == 'x'){
-		    q_status_message(SM_ORDER,0,3,"Change cancelled");
+		    q_status_message(SM_ORDER,0,3,"ק");
a435 32
 		} 
 		else{
@@@@ -7003,8 +7002,8 @@@@
 		    parse_printer((*cl)->var->user_val.l[(*cl)->varmem],
 			&nick, &p, &init, &trailer, NULL, NULL);
 		    
-		    sprintf(prompt, "Change %s string : ",
-			(j == 'i') ? "INIT" : "TRAILER");
+		    sprintf(prompt, "ק %s rG",
+			(j == 'i') ? "l" : "");
 		    strcpy(sval, (j == 'i') ? init : trailer);
 
 		    tmp = string_to_cstring(sval);
@@@@ -7059,7 +7058,7 @@@@
 			    newval = &(*cl)->value;
 			}
 			else if(i == 1){
-			    q_status_message(SM_ORDER,0,3,"Change cancelled");
+			    q_status_message(SM_ORDER,0,3,"ק");
 			}
 			else if(i == 3){
 			    help=(help == NO_HELP)?h_config_print_init:NO_HELP;
@@@@ -7137,18 +7136,18 @@@@
 
       case MC_DELETE :
 	if((*cl)->d.c.ct->use & CNTXT_INCMNG)
-	  q_status_message1(SM_ORDER, 0, 3, "Sorry, Can't delete %s",
+	  q_status_message1(SM_ORDER, 0, 3, "ܩpALkR %s",
 			    (*cl)->d.c.ct->nickname);
-	else if(!fixed_var((*cl)->var, "delete", "collection"))
+	else if(!fixed_var((*cl)->var, "R", "`"))
 	  context_select_delete(ps, cl);
d437 4
a440 1
 	break;
d442 72
a513 9
       case MC_EDIT :
 	if((*cl)->d.c.ct->use & CNTXT_INCMNG)
-	  q_status_message1(SM_ORDER, 0, 3, "Sorry, Can't rename %s",
+	  q_status_message1(SM_ORDER, 0, 3, "ܩpALkW %s",
 			    (*cl)->d.c.ct->nickname);
-	else if(!fixed_var((*cl)->var, "add to", "collection")){
+	else if(!fixed_var((*cl)->var, "sW", "`")){
 	    context_select_edit(ps, cl);
 	    ps->mangled_screen = 1;
d515 11
a525 201
@@@@ -7156,7 +7155,7 @@@@
 	break;
 
       case MC_ADD :
-	if(!fixed_var((*cl)->var, "add to", "collection")){
+	if(!fixed_var((*cl)->var, "sW", "`")){
 	    context_select_add(ps, cl);
 	    ps->mangled_screen = 1;
 	}
@@@@ -7165,9 +7164,9 @@@@
 
       case MC_SHUFFLE :
 	if((*cl)->d.c.ct->use & CNTXT_INCMNG)
-	  q_status_message1(SM_ORDER, 0, 3, "Sorry, Can't Shuffle %s",
+	  q_status_message1(SM_ORDER, 0, 3, "ܩpALk %s",
 			    (*cl)->d.c.ct->nickname);
-	else if(!fixed_var((*cl)->var, "Shuffle", "collection"))
+	else if(!fixed_var((*cl)->var, "", "`"))
 	  context_select_shuffle(ps, cl);
 
 	break;
@@@@ -7234,7 +7233,7 @@@@
     struct key_menu *km;
     CONT_SCR_S	    *cs;
 
-    if(raw_ctxt = context_edit_screen(ps, "ADD", NULL, NULL, NULL, NULL)){
+    if(raw_ctxt = context_edit_screen(ps, "sW", NULL, NULL, NULL, NULL)){
 
 	/* create a corresponding new CONF_S */
 	new_ctxt = new_context(raw_ctxt, NULL);
@@@@ -7313,7 +7312,7 @@@@
 
 	/* Tell the user it was a huge success... */
 	q_status_message(SM_ORDER, 0, 3,
-		      "New collection added!  Use \"$\" to adjust order.");
+		      "s`[JFIХ \"$\" վ㶶ǡC");
     }
 }
 
@@@@ -7332,11 +7331,11 @@@@
 
     if(!((*cl)->var->user_val.l && (*cl)->var->user_val.l[0])){
 	q_status_message(SM_ORDER | SM_DING, 3, 3,
-			 "Can't delete default value.  Try rename.");
+			 "LkRw]ȡCոէWC");
 	return;
     }
 
-    sprintf(tmp, "Delete the collection definition for \"%.40s\"",
+    sprintf(tmp, "R \"%.40s\" `wq",
 	    old_cl->value);
     if(want_to(tmp, 'n', 'n', NO_HELP, WT_FLUSH_IN) == 'y'){
 	/* Remove from var list */
@@@@ -7448,12 +7447,12 @@@@
 	ps->mangled_body = 1;
 	q_status_message(SM_ORDER, 0, 3,
 			 (old_cl == *cl)
-			   ? "Last collection deleted.  Using default."
-			   : "Collection deleted");
+			   ? "̫@@`wQRCϥιw]ȡC"
+			   : "wQR");
 
     }
     else
-      q_status_message(SM_ORDER, 0, 3, "No collections deleted");
+      q_status_message(SM_ORDER, 0, 3, "S`QR");
 }
 
 
@@@@ -7475,7 +7474,7 @@@@
     if(p = strstr(tpath, "%s"))
       *p = '\0';
 
-    if(raw_ctxt = context_edit_screen(ps, "EDIT", (*cl)->d.c.ct->nickname,
+    if(raw_ctxt = context_edit_screen(ps, "s", (*cl)->d.c.ct->nickname,
 				      (*cl)->d.c.ct->server, tpath,
 				      (*cl)->d.c.ct->dir->view.user)){
 
@@@@ -7545,7 +7544,7 @@@@
 
 	set_current_val((*cl)->var, TRUE, FALSE);
 
-	q_status_message(SM_ORDER, 0, 3, "Collection list entry updated");
+	q_status_message(SM_ORDER, 0, 3, "ws`C");
     }
 }
 
@@@@ -7587,7 +7586,7 @@@@
 	if((cmd = radio_buttons(prompt, -FOOTER_ROWS(ps), ekey,
 				(n == 1) ? 'd' : 0, 'x',
 				NO_HELP, RB_NORM)) == 'x'){
-	    cmd_cancelled("Shuffle");
+	    cmd_cancelled("");
 	}
 	else if((cmd == 'u' && (ctmp = context_select_prev(*cl)))
 		|| (cmd == 'd' && (ctmp = context_select_next(*cl)))){
@@@@ -7686,7 +7685,7 @@@@
 	}
     }
     else
-      q_status_message(SM_ORDER, 0, 3, "Sorry, nothing to Shuffle");
+      q_status_message(SM_ORDER, 0, 3, "ܩpASFiѭ");
 }
 
 
@@@@ -8148,7 +8147,7 @@@@
 	    if(cl->var->current_val.l){
 		int i, l, l2;
 
-		sstrcpy(&p, ": using \"");
+		sstrcpy(&p, "Gثeϥ \"");
 		for(i = 0; cl->var->current_val.l[i]; i++){
 		    if(i)
 		      *p++ = ',';
@@@@ -8180,7 +8179,7 @@@@
 	sprintf(tmp, cl->var->is_fixed
 			? "<%s%s%s%s>%*s" : "<%s%s%s%s>%*s", 
 		cl->var->is_fixed ? fixed_val : no_val,
-		(cl->var->current_val.p) ? ": using \"" : "",
+		(cl->var->current_val.p) ? "Gثeϥ \"" : "",
 		(cl->var->current_val.p) ? cl->var->current_val.p : "",
 		(cl->var->current_val.p) ? "\"" : "",
 		max(0, ps->ttyo->screen_cols - cl->valoffset - 13
@@@@ -8322,7 +8321,7 @@@@
 	p = (struncmp(*vp, "no-", 3)) ? *vp : *vp + 3;
 	if(!strucmp(p, f->name) || (og && !strucmp(p, "old-growth"))){
 	    q_status_message(SM_ORDER, 3, 3,
-			     "Can't change value fixed by sys-admin.");
+			     "Lkקtκ޲zwq]wȡC");
 	    return;
 	}
     }
@@@@ -8360,7 +8359,7 @@@@
 		      (void *)(F_ON(f->value,ps) ? 1 : 0));
     else if(f->value == F_ENABLE_INCOMING &&  F_ON(f->value, ps)){
 	q_status_message(SM_ORDER | SM_DING, 3, 4,
-	    "Folder List changes will take effect your next pine session.");
+	    "ƧXCܱNbUҰ pine ɥͮġC");
     }
     else if(f->value == F_PRESERVE_START_STOP){
 	/* toggle raw mode settings to make tty driver aware of new setting */
@@@@ -8529,8 +8528,8 @@@@
 {
     if(v && v->is_fixed){
 	q_status_message2(SM_ORDER, 3, 3,
-			  "Can't %s sys-admin defined %s.",
-			  action ? action : "change", name ? name : "value");
+			  "Lk%stκ޲zwq%sC",
+			  action ? action : "ק", name ? name : "]w");
 	return(1);
     }
 
@@@@ -8829,7 +8828,7 @@@@
 	    && var->is_list
 	    && !var->user_val.l
 	    && var->current_val.l)))
-      q_status_message(SM_ORDER,0,3,"Using default value");
+      q_status_message(SM_ORDER,0,3,"ϥιw]");
 
     if(var == &ps->vars[V_USER_DOMAIN]){
 	char *p, *q;
@@@@ -8840,7 +8839,7 @@@@
 	    if(*(++p)){
 		if(!revert)
 		  q_status_message2(SM_ORDER, 3, 5,
-		    "User-domain (%s) cannot contain \"@@\"; using %s",
+		    "User-domain (%s) i]A \"@@\"; ϥ %s",
 		    ps->VAR_USER_DOMAIN, p);
 		q = ps->VAR_USER_DOMAIN;
 		while((*q++ = *p++) != '\0')
@@@@ -8849,7 +8848,7 @@@@
 	    else{
 		if(!revert)
 		  q_status_message1(SM_ORDER, 3, 5,
-		    "User-domain (%s) cannot contain \"@@\"; deleting",
+		    "User-domain (%s) i]A \"@@\"; R",
 		    ps->VAR_USER_DOMAIN);
 		fs_give((void **)&ps->USR_USER_DOMAIN);
 		set_current_val(&ps->vars[V_USER_DOMAIN], TRUE, TRUE);
@@@@ -8909,7 +8908,7 @@@@
     else if(var == &ps->vars[V_INIT_CMD_LIST]){
 	if(!revert)
 	  q_status_message(SM_ASYNC, 0, 3,
-	    "Initial command changes will affect your next pine session.");
+	    "lROܱNbUҰ pine ɥͮġC");
     }
     else if(var == &ps->vars[V_VIEW_HEADERS]){
 	ps->view_all_except = 0;
@@@@ -8968,10 +8967,10 @@@@
 	}
 	else if(timeo == 0L && !revert){
 	    q_status_message(SM_ORDER, 4, 6,
-"Warning: automatic new mail checking and mailbox checkpointing is disabled");
+"ĵiGwѰ۰ˬdslPHcˬdI");
 	    if(ps->VAR_INBOX_PATH && ps->VAR_INBOX_PATH[0] == '{')
 	      q_status_message(SM_ASYNC, 3, 6,
-"Warning: mail-check-interval=0 may cause IMAP server connection to time out");
+"ĵiGmail-check-interval=0 iɭP IMAP Asu@@~O");
 	}
     }
 #if defined(DOS) || defined(OS2)
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 46
a46 11
--- pine/send.c.orig	Thu Jul  2 02:32:53 1998
+++ pine/send.c	Wed Jul 15 17:24:57 1998
@@@@ -366,14 +366,14 @@@@
 		    mail_close(stream);
 		    if(ret == 'x'){
 			q_status_message(SM_ORDER, 0, 3,
-					 "Composition cancelled");
+					 "s");
 			return;
 		    }
 		}
d48 98
a145 15
 	    else{
 		q_status_message1(SM_ORDER | SM_DING, 3, 3,
-				  "Can't open Interrupted mailbox: %s",
+				  "Lk}Q_HcG%s",
 				  file_path);
 		if(stream)
 		  mail_close(stream);
@@@@ -442,14 +442,14 @@@@
 
 		    if(ret == 'x'){
 			q_status_message(SM_ORDER, 0, 3,
-					 "Composition cancelled");
+					 "s");
 			done++;
 		    }
d147 2
d152 4
a155 4
-				  "Can't open Postponed mailbox: %s", mbox);
+				  "Lk}DȽwHcG%s", mbox);
 		if(stream)
 		  mail_close(stream);
d157 326
a482 1
@@@@ -524,7 +524,7 @@@@
d484 106
a589 9
 			if(ret == 'x'){
 			    q_status_message(SM_ORDER, 0, 3,
-					     "Composition cancelled");
+					     "s");
 			    done++;
 			}
 		    }
@@@@ -608,7 +608,7 @@@@
 	  fs_give((void **)&tmp_fcc);
d592 17
a608 3
-    pine_send(outgoing, &body, "COMPOSE MESSAGE", fcc,
+    pine_send(outgoing, &body, "sH", fcc,
 	      reply, redraft_pos, lcc, custom, fcc_is_sticky);
a609 166
     if(reply){
@@@@ -675,7 +675,7 @@@@
      */
     if(!stream->nmsgs){
 	q_status_message(SM_ORDER | SM_DING, 3, 5,
-			 "Empty folder.  No messages really postponed!");
+			 "ŪHXCSHuQȽwI");
 	return(redraft_cleanup(stream, TRUE));
     }
     else if(stream == ps_global->mail_stream){
@@@@ -711,7 +711,7 @@@@
 	mn_give(&msgmap);
 
 	if(rv){
-	    q_status_message(SM_ORDER, 0, 3, "Composition cancelled");
+	    q_status_message(SM_ORDER, 0, 3, "s");
 	    (void) redraft_cleanup(stream, FALSE);
 	    return(0);				/* special case */
 	}
@@@@ -949,7 +949,7 @@@@
 	  if(b->type == TYPEMULTIPART){
 	      if(strucmp(b->subtype, "mixed")){
 		  q_status_message1(SM_INFO, 3, 4, 
-				 "Converting Multipart/%s to Multipart/Mixed", 
+				 "ഫ Multipart/%s to Multipart/Mixed", 
 				 b->subtype);
 		  fs_give((void **)&b->subtype);
 		  b->subtype = cpystr("mixed");
@@@@ -957,7 +957,7 @@@@
 	  }
 	  else{
 	      q_status_message2(SM_ORDER | SM_DING, 3, 4, 
-				"Unable to resume type %s/%s message",
+				"Lk~κA %s/%s H",
 				body_types[b->type], b->subtype);
 	      return(redraft_cleanup(stream, TRUE));
 	  }
@@@@ -971,7 +971,7 @@@@
 	    set_mime_type_by_grope(&part->body, NULL);
 	    if(part->body.type != TYPETEXT){
 		q_status_message2(SM_ORDER | SM_DING, 3, 4,
-				  "Unable to resume; first part is non-text: %s/%s",
+				  "Lk~FĤ@@D¤rG%s/%s",
 				  body_types[part->body.type], 
 				  part->body.subtype);
 		return(redraft_cleanup(stream, TRUE));
@@@@ -1299,7 +1299,7 @@@@
 
 	if(rc == 1 || (rc == 0 && !answer)) {
 	    q_status_message(SM_ORDER, 3, 4,
-		   "Send cancelled (User-id must be provided before sending)");
+		   "H(HeѨϥΪ̥N)");
 	    return(0);
 	}
 
@@@@ -1388,7 +1388,7 @@@@
 
 	if(rc == 1 || (rc == 0 && !answer)) {
 	    q_status_message(SM_ORDER, 3, 4,
-	  "Send cancelled (Host/domain name must be provided before sending)");
+	  "H(He D/ W)");
 	    return(0);
 	}
 
@@@@ -1444,7 +1444,7 @@@@
 
         if(rc == 1 || (rc == 0 && answer[0] == '\0')) {
             q_status_message(SM_ORDER, 3, 4,
-	       "Send cancelled (SMTP server must be provided before sending)");
+	       "H(He SMTP A)");
             return(0);
         }
 
@@@@ -1471,31 +1471,31 @@@@
 */
 static struct headerentry he_template[]={
   {"From    : ",  "From",        h_composer_from,       10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}ï",
    0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
   {"Reply-To: ",  "Reply To",    h_composer_reply_to,   10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}ï",
    0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
   {"To      : ",  "To",          h_composer_to,         10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}ï",
    0, 1, 0, 0, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
   {"Cc      : ",  "Cc",          h_composer_cc,         10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}ï",
    0, 1, 0, 0, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
   {"Bcc     : ",  "Bcc",         h_composer_bcc,        10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}ï",
    0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
   {"Newsgrps: ",  "Newsgroups",  h_composer_news,        10, 0, NULL,
-   news_build,    NULL, NULL, news_group_selector,  "To NwsGrps",
+   news_build,    NULL, NULL, news_group_selector,  "sDոsC",
    0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_NONE},
   {"Fcc     : ",  "Fcc",         h_composer_fcc,        10, 0, NULL,
-   NULL,          NULL, NULL, folders_for_fcc,      "To Fldrs",
+   NULL,          NULL, NULL, folders_for_fcc,      "ƧXC",
    0, 0, 0, 1, 1, 1, 0, 0, 0, 0, KS_NONE},
   {"Lcc     : ",  "Lcc",         h_composer_lcc,        10, 0, NULL,
-   build_addr_lcc, NULL, NULL, addr_book_compose_lcc,"To AddrBk",
+   build_addr_lcc, NULL, NULL, addr_book_compose_lcc,"a}ï",
    0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_NONE},
   {"Attchmnt: ",  "Attchmnt",    h_composer_attachment, 10, 0, NULL,
-   NULL,          NULL, NULL, NULL,                 "To Files",
+   NULL,          NULL, NULL, NULL,                 "ɮצC",
    0, 1, 1, 0, 0, 1, 0, 0, 0, 0, KS_NONE},
   {"Subject : ",  "Subject",     h_composer_subject,    10, 0, NULL,
    valid_subject, NULL, NULL, NULL,                 NULL,
@@@@ -1530,7 +1530,7 @@@@
 
 static struct headerentry he_custom_addr_templ={
    NULL,          NULL,          h_composer_custom_addr,10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}ï",
    0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK};
 static struct headerentry he_custom_free_templ={
    NULL,          NULL,          h_composer_custom_free,10, 0, NULL,
@@@@ -1821,7 +1821,7 @@@@
     ekey[0].ch    = ctrl('T');
     ekey[0].rval  = 2;
     ekey[0].name  = "^T";
-    ekey[0].label = "To AddrBk";
+    ekey[0].label = "a}ï";
     ekey[1].ch    = -1;
 
     /*----------------------------------------------------------------------
@@@@ -1932,12 +1932,12 @@@@
 			opts[i].ch      = 'y';
 			opts[i].rval    = 'y';
 			opts[i].name    = "Y";
-			opts[i++].label = "Yes";
+			opts[i++].label = "O";
 
 			opts[i].ch      = 'n';
 			opts[i].rval    = 'n';
 			opts[i].name    = "N";
-			opts[i++].label = "No";
+			opts[i++].label = "_";
 
 			verbose_requested = 0;
 			if(F_ON(F_VERBOSE_POST, ps_global)){
@@@@ -1984,7 +1984,7 @@@@
 			    dsn_show = (dsn_requested & DSN_SHOW);
 			    sprintf(tmp_20k_buf,
 				    "%s%s%s%s%s%sto \"%s\" ? ",
-				    prmpt_cnf ? prmpt_cnf : "Send message ",
+				    prmpt_cnf ? prmpt_cnf : "eH ",
 				    (verbose_requested || dsn_show)
 				      ? "(" : "",
 				    (verbose_requested)
@@@@ -2164,7 +2164,7 @@@@
 			}
 		    }
 		    else{
-			q_status_message(SM_ORDER, 0, 3, "Send cancelled");
+			q_status_message(SM_ORDER, 0, 3, "H");
 			retval = -1;
 		    }
 		}
@@@@ -2192,7 +2192,7 @@@@
d611 6
a617 5
 	  case 1:
-	    q_status_message(SM_ORDER, 0, 3, "Send cancelled");
+	    q_status_message(SM_ORDER, 0, 3, "H");
 	    done++;
 	    retval = -1;
a618 2
@@@@ -2436,7 +2436,7 @@@@
 		break;
d620 50
a669 22
 	      case 'x': /* ^C */
-		q_status_message(SM_ORDER, 0, 3, "Message cancelled");
+		q_status_message(SM_ORDER, 0, 3, "H");
 		dprint(4, (debugfile, "=== send: cancelled\n"));
 		return;
 
@@@@ -2853,7 +2853,7 @@@@
 #endif
 		if(pf->canedit || !he->rich_header)
 		  q_status_message(SM_ORDER, 3, 3,
-			"Not allowed to change header \"From\"");
+			"\\ܼY \"From\"");
 
 		memset(he, 0, (size_t)sizeof(*he));
 		pf->he = NULL;
@@@@ -3196,7 +3196,7 @@@@
 				   ? "CANCEL" : "HUH?"));
 	    if((editor_result & COMP_CANCEL)
 	       && F_ON(F_QUELL_DEAD_LETTER, ps_global)){
-		q_status_message(SM_ORDER, 0, 3, "Message cancelled");
+		q_status_message(SM_ORDER, 0, 3, "H");
 		break;
a671 136
@@@@ -3474,15 +3474,15 @@@@
 		if(fcc_result && folder)
 		  lc = last_cmpnt(folder);
 
-		q_status_message3(SM_ORDER, 0, 3, "Message cancelled%s%s%s",
-				  (lc && *lc) ? " and copied to \"" : "",
+		q_status_message3(SM_ORDER, 0, 3, "H%s%s%s",
+				  (lc && *lc) ? " ýƻs \"" : "",
 				  (lc && *lc) ? lc : "",
 				  (lc && *lc) ? "\" file" : "");
 		break;
             }
 	    else{
 		q_status_message(SM_ORDER, 0, 4,
-		    "Continuing composition.  Message not postponed or sent");
+		    "~sCH󥼳QȽwΰeX");
 		body_start = 1;
 		continue; /* postpone failed, jump back in to composer */
             }
@@@@ -3547,8 +3547,8 @@@@
 	       && !filter_message_text(sending_filter_requested, outgoing,
 				       *body, &orig_so)){
 		q_status_message1(SM_ORDER, 3, 3,
-				 "Problem filtering!  Nothing sent%s.",
-				 fcc ? " or saved to fcc" : "");
+				 "LoDISFQeX%sC",
+				 fcc ? "Φs fcc" : "");
 		continue;
 	    }
 
@@@@ -3938,23 +3938,23 @@@@
     char *buf;
     int  *goodorbad;
 {
-    sprintf(buf, "Message %s%s%s%s%s%s%s.",
+    sprintf(buf, "H %s%s%s%s%s%s%s.",
 	    (result & P_NEWS_WIN)
-	       ? "posted" 
+	       ? "wZn" 
 	       : (result & P_NEWS_LOSE)
-	            ? "NOT posted" : "",
+	            ? "QZn" : "",
 	    ((result & P_NEWS_BITS) && (result & P_MAIL_BITS)
 	     && (result & P_FCC_BITS))
 	      ? ", "
 	      : ((result & P_NEWS_BITS) && (result & P_MAIL_BITS))
-	          ? " and " : "",
+	          ? "  " : "",
 	    (result & P_MAIL_WIN)
-	      ? "sent"
+	      ? "wHX"
 	      : (result & P_MAIL_LOSE)
-	          ? "NOT SENT" : "",
+	          ? "HX" : "",
 	    ((result & (P_MAIL_BITS | P_NEWS_BITS)) && (result & P_FCC_BITS))
-	      ? " and copied to " 
-	      : (result & P_FCC_WIN) ? "ONLY copied to " : "",
+	      ? " óQƻs " 
+	      : (result & P_FCC_WIN) ? "ȳQƻs " : "",
 	    (result & P_FCC_WIN) ? "\"" : "",
 	    (result & P_FCC_WIN) ? fcc_name  : "",
 	    (result & P_FCC_WIN) ? "\"" : "");
@@@@ -4281,12 +4281,12 @@@@
     opts[i].ch      = 'y';
     opts[i].rval    = 'y';
     opts[i].name    = "Y";
-    opts[i++].label = "Yes";
+    opts[i++].label = "O";
 
     opts[i].ch      = 'n';
     opts[i].rval    = 'n';
     opts[i].name    = "N";
-    opts[i++].label = "No";
+    opts[i++].label = "_";
 
     if(filters){
 	/* set global_filter_pointer to desired filter or NULL if none */
@@@@ -4294,12 +4294,12 @@@@
 	opts[i].ch      = ctrl('P');
 	opts[i].rval    = 10;
 	opts[i].name    = "^P";
-	opts[i++].label = "Prev Filter";
+	opts[i++].label = "e@@ӹLo";
 
 	opts[i].ch      = ctrl('N');
 	opts[i].rval    = 11;
 	opts[i].name    = "^N";
-	opts[i++].label = "Next Filter";
+	opts[i++].label = "U@@ӹLo";
 
 	if(F_ON(F_FIRST_SEND_FILTER_DFLT, ps_global))
 	  filters = filters->next;
@@@@ -4369,23 +4369,23 @@@@
 	  p = NULL;
 
 	dsn_show = (dsn_requested & DSN_SHOW);
-	sprintf(tmp_20k_buf, "Send message%s%s%s%s%s%s%s%s%s%s%s%s? ",
+	sprintf(tmp_20k_buf, "eXH%s%s%s%s%s%s%s%s%s%s%s%s? ",
 		(filters || verbose_requested || background_requested
 					      || dsn_show)
 		  ? " (" : "",
-		(filters && filters->filter) ? "filtered thru \"" : "",
+		(filters && filters->filter) ? "gѹLo \"" : "",
 		(filters)
 		  ? (filters->filter
 		      ? filters->filter
-		      : "unfiltered")
+		      : "gLo")
 		  : "",
 		(filters && filters->filter) ? "\"" : "",
 		(filters && (verbose_requested || background_requested))
 		  ? " " : "",
 		(verbose_requested || background_requested)
 		  ? "in " : "",
-		(verbose_requested) ? "verbose " : "",
-		(background_requested) ? "background " : "",
+		(verbose_requested) ? "ܲӸ` " : "",
+		(background_requested) ? "IeX " : "",
 		(verbose_requested || background_requested)
 		  ? "mode" : "",
 		(dsn_show
@@@@ -4400,11 +4400,11 @@@@
 	  *p = ' ';
 
 	if(verbose_label)
-	  opts[verbose_label].label = verbose_requested ? "Normal" : "Verbose";
+	  opts[verbose_label].label = verbose_requested ? "q`" : "ܲӸ`";
 
 	if(bg_label)
 	  opts[bg_label].label = background_requested
-				   ? "Foreground" : "Background";
+				   ? "e" : "I";
 
 	if(F_ON(F_DSN, ps_global)){
 	    if(dsn_requested & DSN_SHOW){
@@@@ -4428,11 +4428,11 @@@@
d673 47
a719 4
 	}
 	else if(rv == 'n'){			/* Declined! */
-	    rstr = "No Message Sent";
+	    rstr = "SHQeX";
d722 4
a725 4
 	else if(rv == 'z'){			/* Cancelled! */
-	    rstr = "Send Cancelled";
+	    rstr = "e";
 	    break;
d727 108
a834 25
 	else if(rv == 10)			/* PREVIOUS filter */
@@@@ -4614,7 +4614,7 @@@@
     if(body->type != TYPEOTHER){
 	rv = 1;
 	q_status_message3(SM_ORDER, 0, 3,
-	    "File %s attached as type %s/%s", file,
+	    "ɮ %s [ %s/%s", file,
 	    body_types[body->type],
 	    body->subtype ? body->subtype : rfc822_default_subtype(body->type));
     }
@@@@ -4663,7 +4663,7 @@@@
 	(void) close_system_pipe(&syspipe);
 	if((l = name_file_size(fname)) < 0L){
 	    q_status_message2(SM_ORDER | SM_DING, 3, 4,
-			      "Error determining size of %s: %s", fname,
+			      "Mwɮ %s jpɵoͿ~G%s", fname,
 			      fnp = error_description(errno));
 	    dprint(1, (debugfile,
 		       "!!! Upload cmd \"%s\" failed for \"%s\": %s\n",
@@@@ -4675,7 +4675,7 @@@@
 	return(l >= 0);
     }
     else
-      q_status_message(SM_ORDER | SM_DING, 3, 4, "Error opening pipe");
+      q_status_message(SM_ORDER | SM_DING, 3, 4, "}Һ޽uɵoͿ~");
d836 57
a892 13
     return(0);
 }
@@@@ -4728,7 +4728,7 @@@@
 	else if(reply->flags == REPLY_MSGNO)
 	  return;
 
-	we_cancel = busy_alarm(1, "Updating \"Answered\" Flags", NULL, 1);
+	we_cancel = busy_alarm(1, "bs \"w^\" X", NULL, 1);
 	if(!stream){
 	    if(stream = mail_open(NULL, reply->mailbox, OP_SILENT)){
 		ourstream++;
@@@@ -4806,7 +4806,7 @@@@
 		so_give(&tmpf_so);
d895 2
a896 2
-	      errstr = "Can't create space for filter temporary file.";
+	      errstr = "Lkإ߹LoȦsɡC";
d899 113
a1011 11
 	if(!errstr){
@@@@ -4830,13 +4830,13 @@@@
 				so_give(&tmpf_so);
 			    }
 			    else
-			      errstr = "Can't open temp file filter wrote.";
+			      errstr = "Lk}ҹLoȦsɡC";
 			}
 			else
-			  errstr = "Filter command returned error.";
+			  errstr = "LoOǦ^~ȡC";
d1014 52
a1065 2
-		      errstr = "Can't exec filter text.";
+		      errstr = "LkLoC";
d1068 37
a1104 72
 		  errstr = gf_filter(cmd, key ? filter_session_key() : NULL,
@@@@ -4847,7 +4847,7 @@@@
 		if(errstr){
 		    int ch;
 
-		    fprintf(stdout, "\r\n%s  Hit return to continue.", errstr);
+		    fprintf(stdout, "\r\n%s  J return ~C", errstr);
 		    fflush(stdout);
 		    while((ch = read_char(300)) != ctrl('M')
 			  && ch != NO_OP_IDLE)
@@@@ -4940,7 +4940,7 @@@@
 	if(tmp_so)
 	  so_give(&tmp_so);
 
-	q_status_message1(SM_ORDER | SM_DING, 3, 6, "Problem filtering: %s",
+	q_status_message1(SM_ORDER | SM_DING, 3, 6, "LoL{DG%s",
 			  errstr);
 	dprint(1, (debugfile, "Filter FAILED: %s\n", errstr));
     }
@@@@ -5072,7 +5072,7 @@@@
 
     if(!pf){
 	q_status_message(SM_ORDER,3,3,
-	    "Can't send message. No recipients specified!");
+	    "LkeHC|wHHI");
 	return(0);
     }
 
@@@@ -5081,7 +5081,7 @@@@
     gf_filter_init();				/* zero piped byte count, 'n */
     send_bytes_to_send = send_body_size(body);	/* count body bytes	     */
     ps_global->c_client_error[0] = error_buf[0] = '\0';
-    we_cancel = busy_alarm(1, "Sending mail",
+    we_cancel = busy_alarm(1, "bHH",
 			   send_bytes_to_send ? sent_percent : NULL, 1);
 
     /* try posting via local "<mta> <-t>" if specified */
@@@@ -5263,7 +5263,7 @@@@
 	    struct headerentry *last_he = NULL;
 
 	    sprintf(error_buf,
-		    "Mail not sent. Sending error%s%.40s",
+		    "H󥼳QHXCH~%s%.40s",
 		    (sending_stream && sending_stream->reply) ? ": ": ".",
 		    (sending_stream && sending_stream->reply)
 		      ? sending_stream->reply : "");
@@@@ -5334,7 +5334,7 @@@@
 	TIME_STAMP("smtp done", 1);
     }
     else if(!error_mess)
-      sprintf(error_mess = error_buf, "Error sending: %.60s",
+      sprintf(error_mess = error_buf, "HHɵoͿ~G%.60s",
 	      ps_global->c_client_error);
 
     if(verbose_file){
@@@@ -5431,12 +5431,12 @@@@
         if(folder_index(fcc, *fcc_cntxt, FI_FOLDER) < 0){
 	    if(ps_global->context_list->next)
 	      sprintf(tmp_20k_buf,
-		      "Folder \"%.20s\" in <%.30s> doesn't exist. Create",
+		      "HX \"%.20s\" b <%.30s> |sbCns",
 		      strsquish(tmp_20k_buf + 500, fcc, 20),
 		      strsquish(tmp_20k_buf + 1000,(*fcc_cntxt)->nickname,30));
 	    else
 	      sprintf(tmp_20k_buf,
-		      "Folder \"%s\" doesn't exist.  Create",
+		      "HX \"%s\" |sbCns",
 		      strsquish(tmp_20k_buf + 500, fcc, 40));
 
 	    if(force || want_to(tmp_20k_buf,'y','n',NO_HELP,WT_NORM) == 'y'){
@@@@ -5473,7 +5473,7 @@@@
 	    ok++;
d1107 17
a1123 18
-	    sprintf(tmp_20k_buf,"Folder \"%s\" doesn't exist.  Create",
+	    sprintf(tmp_20k_buf,"HX \"%s\" |sbCns",
 		    strsquish(tmp_20k_buf + 500, fcc, 40));
 	    if(force || want_to(tmp_20k_buf,'y','n',NO_HELP,WT_NORM) == 'y'){
 		/*
@@@@ -5507,8 +5507,8 @@@@
 
 	if(ok == 0){
 	    if(ps_global->mm_log_error){
-		s1 = err_prefix ? err_prefix : "Fcc Error: ";
-		s2 = err_suffix ? err_suffix : " Message NOT sent or copied.";
+		s1 = err_prefix ? err_prefix : "Fcc ~G";
+		s2 = err_suffix ? err_suffix : " HSQHXνƻsC";
 
 		l1 = strlen(s1);
 		l2 = strlen(s2);
@@@@ -5526,10 +5526,10 @@@@
 
d1126 158
a1283 2
-	      errstr = "Fcc creation error. Message NOT sent or copied.";
+	      errstr = "إ Fcc ɵoͿ~CHSQeXνƻsC";
d1285 31
a1315 3
 	else
-	  errstr = "Fcc creation rejected. Message NOT sent or copied.";
+	  errstr = "Fcc إ߾DڵCHSQeXνƻsC";
d1317 5
a1321 1
 	q_status_message(SM_ORDER | SM_DING, 3, 3, errstr);
d1323 15
a1337 7
@@@@ -5577,7 +5577,7 @@@@
     if(label && *label){
 	char msg_buf[80];
 
-	strncat(strcpy(msg_buf, "Writing "), label, 70);
+	strncat(strcpy(msg_buf, "bgJ "), label, 70);
 	we_cancel = busy_alarm(1, msg_buf, NULL, 1);
d1340 22
a1361 2
@@@@ -5613,7 +5613,7 @@@@
 	we_cancel = 0;
d1363 10
a1372 37
 	q_status_message1(SM_ORDER | SM_DING, 3, 5,
-			  "Write to \"%s\" FAILED!!!", fcc);
+			  "gJ \"%s\" ѡIII", fcc);
 	dprint(1, (debugfile, "ERROR appending %s in \"%s\"",
 		   fcc, cntxt ? cntxt->context : "NULL"));
 	return(0);
@@@@ -6089,7 +6089,7 @@@@
 	if((file_contents = (void *)so_get(FileStar, pa->filename,
 					   READ_ACCESS)) == NULL){
             q_status_message2(SM_ORDER | SM_DING, 3, 4,
-                              "Error \"%s\", couldn't attach file \"%s\"",
+                              "~ \"%s\"ALk[ɮ \"%s\"",
                               error_description(errno), pa->filename);
             display_message('x');
             continue;
@@@@ -6616,13 +6616,17 @@@@
 		body->subtype = cpystr("octet-stream");
 	    }
 
-	    /*
-	     * Apply maximal encoding regardless of previous
-	     * setting.  This segment's either not text, or is 
-	     * unlikely to be readable with > 30% of the
-	     * text encoded anyway, so we might as well save space...
-	     */
-	    new_encoding = ENCBINARY;   /*  > 30% 8 bit chars */
+	    if(body->type == TYPETEXT)
+              /* Use ENC8BIT rather than ENCBINARY for TEXT */
+	      new_encoding = ENC8BIT;
+	    else
+	      /*
+	       * Apply maximal encoding regardless of previous
+	       * setting.  This segment's either not text, or is 
+	       * unlikely to be readable with > 30% of the
+	       * text encoded anyway, so we might as well save space...
+	       */
+	      new_encoding = ENCBINARY;   /*  > 30% 8 bit chars */
d1375 4
a1379 12
@@@@ -6791,6 +6795,9 @@@@
     value = rfc1522_encode(tmp_20k_buf, (unsigned char *) text,
 			   ps_global->VAR_CHAR_SET);
     
+    if (!strcmp(field, "Subject"))
+	value = text;
+
     if(value && value == text){	/* no encoding was done, have to fold */
 	int   fold_by = 75, len;
 	char *actual_field;
@@@@ -7111,7 +7118,7 @@@@
 	    break;
d1381 25
a1405 4
 	  default:
-	    q_status_message1(SM_ORDER,3,7,"Unknown header type: %s",pf->name);
+	    q_status_message1(SM_ORDER,3,7,"YκAG%s",pf->name);
 	    break;
d1408 19
a1426 1
@@@@ -7439,7 +7446,8 @@@@
d1428 49
a1476 35
 	switch (body->encoding) {	/* all else needs filtering */
 	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
-	    gf_link_filter(gf_8bit_qp, NULL);
+	    if(F_OFF(F_ENABLE_8BIT, ps_global)) /* unless 8BIT enabled */
+		gf_link_filter(gf_8bit_qp, NULL);
 	    break;
 
 	  case ENCBINARY:		/* encode binary into BASE64 */
@@@@ -7453,7 +7461,7 @@@@
 
     if(encode_error = gf_pipe(gc, l_putc)){ /* shove body part down pipe */
 	q_status_message1(SM_ORDER | SM_DING, 3, 4,
-			  "Encoding Error \"%s\"", encode_error);
+			  "sXɵoͿ~ \"%s\"", encode_error);
 	display_message('x');
     }
 
@@@@ -7506,7 +7514,7 @@@@
       sprintf (*dst += strlen (*dst),"Content-Transfer-Encoding: %s\015\012",
 	       body_encodings[(body->encoding == ENCBINARY)
 				? ENCBASE64
-				: (body->encoding == ENC8BIT)
+				: (body->encoding == ENC8BIT && F_OFF(F_ENABLE_8BIT, ps_global))
 				    ? ENCQUOTEDPRINTABLE
 				    : (body->encoding <= ENCMAX)
 					? body->encoding : ENCOTHER]);
@@@@ -8063,7 +8071,7 @@@@
 		   || (forbid = pine_header_forbidden(name))){
 		    if(forbid)
 		      q_status_message1(SM_ORDER, 3, 3,
-			    "Not allowed to change header \"%s\"", name);
+			    "\\ܼY \"%s\"", name);
 
 		    *t = save;
 		    continue;
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@d1 264
a264 157
--- pine/mailview.c.orig	Fri Jul 12 06:49:32 1996
+++ pine/mailview.c	Sat Jan 17 21:07:22 1998
@@@@ -1955,12 +1955,12 @@@@
  * is stored with each entry and it could be different for each.
  */
 static struct key help_keys[] =
-       {{"M","Main Menu",KS_MAINMENU},	{NULL,NULL,KS_NONE},
-	{"E","Exit Help",KS_EXITMODE},	{NULL,NULL,KS_NONE},
+       {{"M","D",KS_MAINMENU},	{NULL,NULL,KS_NONE},
+	{"E","}",KS_EXITMODE},	{NULL,NULL,KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
-	{"Y","prYnt",KS_PRINT},		{"Z","Print All",KS_NONE},
-	{"B","Report Bug",KS_NONE},	{"W","WhereIs",KS_WHEREIS}};
+	{"-","W@@",KS_PREVPAGE},	{"Spc","U@@",KS_NEXTPAGE},
+	{"Y","CL",KS_PRINT},		{"Z","Print All",KS_NONE},
+	{"B","~^",KS_NONE},	{"W","jM",KS_WHEREIS}};
 INST_KEY_MENU(help_keymenu, help_keys);
 #define	HLP_MAIN_KEY	0
 #define	HLP_ALL_KEY	9
@@@@ -1968,34 +1968,34 @@@@
 
 static struct key review_keys[] =
        {{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
-	{"E","Exit",KS_EXITMODE},	{NULL,NULL,KS_NONE},
+	{"E","}",KS_EXITMODE},	{NULL,NULL,KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
-	{"Y","prYnt",KS_PRINT},		{NULL,NULL,KS_NONE},
-	{NULL,NULL,KS_NONE},		{"W","WhereIs",KS_WHEREIS}};
+	{"-","W@@",KS_PREVPAGE},	{"Spc","U@@",KS_NEXTPAGE},
+	{"Y","CL",KS_PRINT},		{NULL,NULL,KS_NONE},
+	{NULL,NULL,KS_NONE},		{"W","jM",KS_WHEREIS}};
 INST_KEY_MENU(review_keymenu, review_keys);
 
 static struct key view_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{"O","OTHER CMDS",KS_NONE},
-	{"M","Main Menu",KS_MAINMENU},	{"V","ViewAttch",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},
-	{"I","Index",KS_FLDRINDEX},	{"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","˵",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","s",KS_COMPOSER},
+	{"L","CXH",KS_FLDRLIST},	{"G","iJH",KS_GOTOFLDR},
+	{"I","",KS_FLDRINDEX},	{"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},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
-	{"J","Jump",KS_JUMPTOMSG},	{"TAB","NextNew",KS_NONE},
-	{"H","HdrMode",KS_HDRMODE},	{"B","Bounce",KS_BOUNCE},
-	{"*","Flag",KS_FLAG},		{"|","Pipe",KS_NONE}};
+	{"J","",KS_JUMPTOMSG},	{"TAB","U@@",KS_NONE},
+	{"H","YҦ",KS_HDRMODE},	{"B","Bounce",KS_BOUNCE},
+	{"*","X",KS_FLAG},		{"|","Pipe",KS_NONE}};
 INST_KEY_MENU(view_keymenu, view_keys);
 #define VIEW_FULL_HEADERS_KEY 32
 #define BOUNCE_KEY 33
@@@@ -2003,49 +2003,49 @@@@
 #define VIEW_PIPE_KEY 35
 
 static struct key nr_anon_view_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{"W","WhereIs",KS_WHEREIS},
-	{"Q", "Quit",KS_EXIT},		{NULL,NULL,KS_NONE},
-	{"P","PrevMsg",KS_PREVMSG},	{"N","NextMsg",KS_NEXTMSG},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
-	{"F","Fwd Email",KS_FORWARD},	{"J","Jump",KS_JUMPTOMSG},
-	{"I", "Index",KS_FLDRINDEX},	{NULL, NULL,KS_NONE}};
+       {{"?","U",KS_SCREENHELP},	{"W","jM",KS_WHEREIS},
+	{"Q", "}",KS_EXIT},		{NULL,NULL,KS_NONE},
+	{"P","e@@",KS_PREVMSG},	{"N","@@",KS_NEXTMSG},
+	{"-","W@@",KS_PREVPAGE},	{"Spc","U@@",KS_NEXTPAGE},
+	{"F","H",KS_FORWARD},	{"J","",KS_JUMPTOMSG},
+	{"I", "",KS_FLDRINDEX},	{NULL, NULL,KS_NONE}};
 INST_KEY_MENU(nr_anon_view_keymenu, nr_anon_view_keys);
 
 static struct key nr_view_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{"O","OTHER CMDS",KS_NONE},
-	{"Q","Quit",KS_EXIT},		{NULL,NULL,KS_NONE},
-	{"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},
+       {{"?","U",KS_SCREENHELP},	{"O","䥦RO",KS_NONE},
+	{"Q","}",KS_EXIT},		{NULL,NULL,KS_NONE},
+	{"P","e@@",KS_PREVMSG},	{"N","@@",KS_NEXTMSG},
+	{"-","W@@",KS_PREVPAGE},	{"Spc","U@@",KS_NEXTPAGE},
+	{"F","H",KS_FORWARD},	{"J","",KS_JUMPTOMSG},
+	{"Y","CL",KS_PRINT},		{"S","xs",KS_SAVE},
 
-	{"?","Help",KS_SCREENHELP},	{"O","OTHER CMDS",KS_NONE},
-	{"E","Export",KS_EXPORT},	{"C","Compose",KS_COMPOSER},
+	{"?","U",KS_SCREENHELP},	{"O","OTHER CMDS",KS_NONE},
+	{"E","ץX",KS_EXPORT},		{"C","s",KS_COMPOSER},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
-	{"I","Index",KS_FLDRINDEX},	{"W","WhereIs",KS_WHEREIS},
+	{"I","",KS_FLDRINDEX},	{"W","jM",KS_WHEREIS},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE}};
 INST_KEY_MENU(nr_view_keymenu, nr_view_keys);
 
 static struct key text_att_view_keys[] =
-       {{"?","Help",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
-	{"E","Exit Viewer",KS_EXITMODE},	{NULL,NULL,KS_NONE},
+       {{"?","U",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
+	{"E","}",KS_EXITMODE},	{NULL,NULL,KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
-	{"Y","prYnt",KS_PRINT},		{"S","Save",KS_SAVE},
-	{"|","Pipe",KS_NONE},		{"W", "WhereIs",KS_WHEREIS}};
+	{"-","W@@",KS_PREVPAGE},	{"Spc","U@@",KS_NEXTPAGE},
+	{"Y","CL",KS_PRINT},		{"S","xs",KS_SAVE},
+	{"|","Pipe",KS_NONE},		{"W", "jM",KS_WHEREIS}};
 INST_KEY_MENU(text_att_view_keymenu, text_att_view_keys);
 #define ATT_SAVE_KEY 9
 #define ATT_PIPE_KEY 10
 
 
 static struct key simple_view_keys[] =
-       {{"?","Help",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
-	{"Q","Quit Viewer",KS_NONE},	{NULL,NULL,KS_NONE},
+       {{"?","U",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
+	{"Q","}",KS_NONE},	{NULL,NULL,KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
-	{"F","Fwd Email",KS_FORWARD},	{"S","Save",KS_SAVE},
-	{NULL,NULL,KS_NONE},		{"W","WhereIs",KS_WHEREIS}};
+	{"-","W@@",KS_PREVPAGE},	{"Spc","U@@",KS_NEXTPAGE},
+	{"F","H",KS_FORWARD},	{"S","xs",KS_SAVE},
+	{NULL,NULL,KS_NONE},		{"W","jM",KS_WHEREIS}};
 INST_KEY_MENU(simple_view_keymenu, simple_view_keys);
 #define SAVE_KEY 9
 
@@@@ -2342,7 +2342,7 @@@@
 	    }
             if(style == HelpText || style == MainHelpText
 	       || style == ComposerHelpText) {
-                q_status_message(SM_ORDER, 0, 5, "Already in Help");
+                q_status_message(SM_ORDER, 0, 5, "wgbU椤");
d266 17
d285 178
a462 1
@@@@ -2722,7 +2722,7 @@@@
d464 209
a672 17
 		else if((ch == 'z' || ch == PF10) && style == MainHelpText){
 		    print_all_help();
-    	        }else if(!ps_global->nr_mode && (ch == PF3 || ch == 'e')) {
+    	        }else if(!ps_global->nr_mode && (ch == PF3 || ch == 'e' || ch == KEY_LEFT)) {
     	            /*----------- Done -----------*/
                     done = 1;
                 }else if((ch == 'y' && !ps_global->anonymous) ||
@@@@ -2843,8 +2843,8 @@@@
     int         rc;
     static char search_string[MAX_SEARCH+1] = { '\0' };
     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}
 					};
d674 2
@
