--- 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 :
