--- 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 @@
 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,
@@ -171,11 +171,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,
@@ -192,7 +192,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,
@@ -216,7 +216,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,
@@ -238,7 +238,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,
@@ -247,7 +247,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);
 
 
@@ -388,7 +388,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;
 	}
@@ -402,7 +402,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)));
@@ -457,7 +457,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
@@ -477,11 +477,11 @@
 	else
 	  scrollargs.body_valid = 1;
 
-	scrollargs.bar.title	= "MESSAGE TEXT";
+	scrollargs.bar.title	= "Hr";
 	scrollargs.end_scroll	= view_end_scroll;
 	scrollargs.resize_exit	= 1;
 	scrollargs.help.text	= h_mail_view;
-	scrollargs.help.title	= "HELP FOR MESSAGE TEXT VIEW";
+	scrollargs.help.title	= "HrU";
 	scrollargs.keys.menu	= &view_keymenu;
 	scrollargs.keys.what    = save_what;
 	setbitmap(scrollargs.keys.bitmap);
@@ -1214,7 +1214,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);
@@ -1253,7 +1253,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);
 	}
@@ -1547,7 +1547,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);
@@ -1885,12 +1885,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){
@@ -1920,7 +1920,7 @@
 		  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';
@@ -1964,7 +1964,7 @@
 				}
 				else{
 				    q_status_message1(SM_ORDER | SM_DING, 2, 2,
-						     "Browser not found: %s",
+						     "䤣sG%s",
 						     error_description(errno));
 				    continue;
 				}
@@ -1994,8 +1994,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)
@@ -2606,11 +2606,11 @@
 	mode = PIPE_RESET | PIPE_USER ;
 	if(syspipe = open_system_pipe(cmd, NULL, NULL, mode)){
 	    close_system_pipe(&syspipe);
-	    q_status_message(SM_ORDER, 0, 4, "VIEWER command completed");
+	    q_status_message(SM_ORDER, 0, 4, "˵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)
@@ -2618,7 +2618,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);
@@ -2630,7 +2630,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);
 }
 
@@ -2920,7 +2920,7 @@
     }
     else
       q_status_message(SM_ORDER | SM_DING, 3, 4,
-		       "Can't create space for composer");
+		       "Lks边إߪŶ");
 
     if(outgoing)
       mail_free_envelope(&outgoing);
@@ -2984,7 +2984,7 @@
 	else if(errstr)
 	  q_status_message(SM_ORDER|SM_DING, 3, 3, errstr);
 	else
-	  cmd_cancelled("URL Launch");
+	  cmd_cancelled("˵ URL");
 
 	break;
 
@@ -3007,7 +3007,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){
@@ -3023,7 +3023,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){
 		/*
@@ -3044,9 +3044,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);
 		}
@@ -3185,9 +3185,9 @@
 
 	    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
@@ -3272,7 +3272,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;
@@ -3386,7 +3386,7 @@
     }
     else
       q_status_message1(SM_ORDER | SM_DING, 0, 3,
-			"Can't find fragment: %s", fragment);
+			"䤣_G%s", fragment);
 
     return(1);
 }
@@ -3413,7 +3413,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);
@@ -3554,7 +3554,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);
@@ -3805,7 +3805,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
@@ -3815,7 +3815,7 @@
 	    }
 	    else{
 		q_status_message1(SM_ORDER | SM_DING, 3, 3,
-				  "No space for filtered text: %s", errstr);
+				  "SŶLorG%s", errstr);
 		rv = FHT_WRTERR;
 	    }
 	}
@@ -3841,7 +3841,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);
 	    }
 	}
 
@@ -3984,7 +3984,7 @@
 	format_newsgroup_string("Newsgroups: ", e->newsgroups, prefix, pc);
 	if(e->ngbogus)
 	  q_status_message(SM_ORDER, 0, 3,
-     "Unverified Newsgroup header -- Message MAY or MAY NOT have been posted");
+     "gҹꪺsDոsY -- TiqQiK");
     }
 
     if((which & FE_FOLLOWUPTO) && e->followup_to)
@@ -4624,7 +4624,7 @@
     }
 
     if(!sparms->bar.title)
-      sparms->bar.title = "Text";
+      sparms->bar.title = "r";
 
     if(sparms->bar.style == TitleBarNone)
       sparms->bar.style = MsgTextPercent;
@@ -4773,7 +4773,7 @@
 	}
 
 	if(first_view && num_display_lines >= get_scroll_text_lines())
-	  q_status_message1(SM_INFO, 0, 1, "ALL of %s", STYLE_NAME(sparms));
+	  q_status_message1(SM_INFO, 0, 1, "%s ", STYLE_NAME(sparms));
 			    
 
 	force      = 0;		/* may not need to next time around */
@@ -4898,7 +4898,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;
             }
 
@@ -4937,12 +4937,12 @@
 		cur_top_line -= scroll_lines;
 		if(cur_top_line <= 0){
 		    cur_top_line = 0;
-		    q_status_message1(SM_INFO, 0, 1, "START of %s",
+		    q_status_message1(SM_INFO, 0, 1, "%s_l",
 				      STYLE_NAME(sparms));
 		}
 	    }
 	    else
-	      q_status_message1(SM_ORDER, 0, 1, "Already at start of %s",
+	      q_status_message1(SM_ORDER, 0, 1, "wgb%s_l",
 				STYLE_NAME(sparms));
             break;
 
@@ -4956,12 +4956,12 @@
 		cur_top_line += scroll_lines;
 
 		if(cur_top_line + num_display_lines >= get_scroll_text_lines())
-		  q_status_message1(SM_INFO, 0, 1, "END of %s",
+		  q_status_message1(SM_INFO, 0, 1, "%s",
 				    STYLE_NAME(sparms));
             }
 	    else if(!sparms->end_scroll
 		    || !(done = (*sparms->end_scroll)(sparms)))
-	      q_status_message1(SM_ORDER, 0, 1, "Already at end of %s",
+	      q_status_message1(SM_ORDER, 0, 1, "wgb%s",
 				STYLE_NAME(sparms));
 
             break;
@@ -4978,11 +4978,11 @@
 		    cur_top_line++;
 		    if(cur_top_line + num_display_lines
 						   >= get_scroll_text_lines())
-		      q_status_message1(SM_INFO, 0, 1, "END of %s",
+		      q_status_message1(SM_INFO, 0, 1, "%s",
 					STYLE_NAME(sparms));
 		}
 		else
-		  q_status_message1(SM_ORDER, 0, 1, "Already at end of %s",
+		  q_status_message1(SM_ORDER, 0, 1, "wgb%s",
 				    STYLE_NAME(sparms));
 	    }
 
@@ -4999,11 +4999,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));
 	    }
 
@@ -5034,7 +5034,7 @@
 		}
 
 		q_status_message(SM_ORDER, 0, 1,
-				 "Already on last selectable item");
+				 "wgb̫@ӥiܪؤW");
 	    }
 
 	    break;
@@ -5064,7 +5064,7 @@
 		}
 
 		q_status_message(SM_ORDER, 0, 1,
-				 "Already on first selectable item");
+				 "wgbĤ@ӥiܪؤW");
 	    }
 
 	    break;
@@ -5083,7 +5083,7 @@
 		    break;
 
 		  case -1 :
-		    cmd_cancelled("View");
+		    cmd_cancelled("˵");
 		    break;
 
 		  default :
@@ -5170,14 +5170,14 @@
 		  q_status_message(SM_ORDER, 0, 3, tmp_20k_buf);
 		else
 		  q_status_message2(SM_ORDER, 0, 3,
-				    "%sFound on line %s on screen",
-				    result ? "Search wrapped to start. " : "",
+				    "%sbeW %s ",
+				    result ? "YjMC" : "",
 				    int2string(whereis_pos.row));
             }
 	    else if(found_on == -1)
-	      cmd_cancelled("Search");
+	      cmd_cancelled("jM");
             else
-	      q_status_message(SM_ORDER | SM_DING, 0, 3, "Word not found");
+	      q_status_message(SM_ORDER | SM_DING, 0, 3, "䤣Ӧr");
 
             break; 
 
@@ -5257,7 +5257,7 @@
 			      break;
 
 			    case -1 :
-			      cmd_cancelled("View");
+			      cmd_cancelled("˵");
 			      break;
 
 			    default :
@@ -5522,13 +5522,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';
 
@@ -5543,13 +5543,13 @@
             continue;
         }
 	else if(rc == 10){
-	    strcpy(report, "Searched to First Line.");
+	    strcpy(report, "jMܲĤ@C");
 	    cursor_pos->row = 0;
 	    cursor_pos->col = 0;
 	    return(0);
 	}
 	else if(rc == 11){
-	    strcpy(report, "Searched to Last Line."); 
+	    strcpy(report, "jM̫ܳ@C"); 
 	    cursor_pos->row = max(get_scroll_text_lines() - 1, 0);
 	    cursor_pos->col = 0;
 	    return(cursor_pos->row);
@@ -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 @@
 	    memset(&sargs, 0, sizeof(SCROLL_S));
 	    sargs.text.text  = f;
 	    sargs.text.src   = FileStar;
-	    sargs.text.desc  = "help text";
+	    sargs.text.desc  = "Ur";
 	    sargs.bar.title  = title;
 	    sargs.bar.style  = TextPercent;
 	    sargs.help.text  = h_simple_text_view;
