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


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

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

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

1.5
date	98.10.10.04.29.23;	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.38;	author vanilla;	state Exp;
branches;
next	1.1;

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


desc
@@


1.8
log
@Upgrade from 4.21 to 4.30.

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

According to kkenn, pine4's security will exist until it's totally
rewritten, so I'll leave pkg-install untouched, which shows the
security warning.
PR:		ports/22436
@
text
@--- pine/adrbkcmd.c.orig	Thu Sep 30 07:21:15 1999
+++ pine/adrbkcmd.c	Thu Oct 14 11:42:22 1999
@@@@ -112,23 +112,23 @@@@
 static struct key abook_view_keys[] =
        {HELP_MENU,
 	OTHER_MENU,
-	{"<","Abook",{MC_EXIT,2,{'<',','}},KS_NONE},
-	{"U","Update",{MC_EDIT,1,{'u'}},KS_NONE},
-	{"C","ComposeTo",{MC_COMPOSE,1,{'c'}},KS_COMPOSER},
+	{"<","a}ï",{MC_EXIT,2,{'<',','}},KS_NONE},
+	{"U","s",{MC_EDIT,1,{'u'}},KS_NONE},
+	{"C","s",{MC_COMPOSE,1,{'c'}},KS_COMPOSER},
 	RCOMPOSE_MENU,
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
 	PRYNTTXT_MENU,
 	WHEREIS_MENU,
-	{"F", "Fwd Email", {MC_FORWARD, 1, {'f'}}, KS_FORWARD},
+	{"F", "HH", {MC_FORWARD, 1, {'f'}}, KS_FORWARD},
 	SAVE_MENU,
 
 	HELP_MENU,
 	OTHER_MENU,
-	{"V","ViewLink",{MC_VIEW_HANDLE,3,{'v',ctrl('m'),ctrl('j')}},KS_NONE},
+	{"V","˵쵲",{MC_VIEW_HANDLE,3,{'v',ctrl('m'),ctrl('j')}},KS_NONE},
 	NULL_MENU,
-	{"^B","PrevLink",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
-	{"^F","NextLink",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
+	{"^B","e@@쵲",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
+	{"^F","U@@쵲",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
 	NULL_MENU,
 	NULL_MENU,
 	NULL_MENU,
@@@@ -141,7 +141,7 @@@@
 static struct key abook_text_keys[] =
        {HELP_MENU,
 	NULL_MENU,
-	{"E","Exit Viewer",{MC_EXIT,1,{'e'}},KS_NONE},
+	{"E","}",{MC_EXIT,1,{'e'}},KS_NONE},
 	NULL_MENU,
 	NULL_MENU,
 	NULL_MENU,
@@@@ -150,7 +150,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(abook_text_km, abook_text_keys);
 
 #define	VIEW_ABOOK_NONE		0
@@@@ -303,7 +303,7 @@@@
 	memset(&sargs, 0, sizeof(SCROLL_S));
 	sargs.text.text	   = so_text(out_store);
 	sargs.text.src	   = CharStar;
-	sargs.text.desc	   = "expanded entry";
+	sargs.text.desc	   = "wi}";
 	sargs.text.handles = handles;
 
 	if(offset){		/* resize?  preserve paging! */
@@@@ -312,13 +312,13 @@@@
 	    offset = 0L;
 	}
 	  
-	sargs.bar.title	  = "ADDRESS BOOK (View)";
+	sargs.bar.title	  = "a}ï]˵^";
 	sargs.bar.style	  = TextPercent;
 	sargs.proc.tool	  = process_abook_view_cmd;
 	sargs.proc.data.i = VIEW_ABOOK_NONE;
 	sargs.resize_exit = 1;
 	sargs.help.text	  = h_abook_view;
-	sargs.help.title  = "HELP FOR ADDRESS BOOK VIEW";
+	sargs.help.title  = "˵a}ïU";
 	sargs.keys.menu	  = &abook_view_keymenu;
 	setbitmap(sargs.keys.bitmap);
 
@@@@ -428,7 +428,7 @@@@
 	if(adrbk_check_all_validity_now()){
 	    if(resync_screen(pab, AddrBookScreen, 0)){
 		q_status_message(SM_ORDER | SM_DING, 3, 4,
-		 "Address book changed. Update cancelled. Try again.");
+		 "a}ïwQʡCsCЭդ@@MC");
 		ps_global->mangled_screen = 1;
 		break;
 	    }
@@@@ -456,7 +456,7 @@@@
 	    abe_copy = copy_ae(abe);
 	    dprint(9, (debugfile,"Calling edit_entry to edit from view\n"));
 	    edit_entry(pab->address_book, abe_copy, entry,
-		       abe->tag, 0, &warped, "update");
+		       abe->tag, 0, &warped, "s");
 	    /*
 	     * The ABOOK_EDITED case doesn't mean that we necessarily
 	     * changed something, just that we might have but we know
@@@@ -506,7 +506,7 @@@@
 			  h_ab_text_or_vcard, RB_NORM);
 	switch(i){
 	  case 'x':
-	    cancel_warning(NO_DING, "forward");
+	    cancel_warning(NO_DING, "H");
 	    rv = 0;
 	    break;
 
@@@@ -741,8 +741,8 @@@@
     memset(&sargs, 0, sizeof(SCROLL_S));
     sargs.text.text = so_text(store);
     sargs.text.src  = CharStar;
-    sargs.text.desc = "expanded entry";
-    sargs.bar.title = "ADDRESS BOOK (Rich View)";
+    sargs.text.desc = "wi}";
+    sargs.bar.title = "a}ï (˵)";
     sargs.bar.style = TextPercent;
     sargs.keys.menu = &abook_text_km;
     setbitmap(sargs.keys.bitmap);
@@@@ -812,8 +812,8 @@@@
     memset(&sargs, 0, sizeof(SCROLL_S));
     sargs.text.text = so_text(store);
     sargs.text.src  = src;
-    sargs.text.desc = "expanded entry";
-    sargs.bar.title = "MESSAGE TEXT";
+    sargs.text.desc = "wi}";
+    sargs.bar.title = "Tr";
     sargs.bar.style = TextPercent;
     sargs.keys.menu = &abook_text_km;
     setbitmap(sargs.keys.bitmap);
@@@@ -836,19 +836,19 @@@@
 */
 static struct headerentry headents_for_edit[]={
   {"Nickname  : ",  "Nickname",  h_composer_abook_nick, 12, 0, NULL,
-   verify_nick,   NULL, NULL, addr_book_nick_for_edit, "To AddrBk", NULL,
+   verify_nick,   NULL, NULL, addr_book_nick_for_edit, "a}ï", NULL,
    1, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
   {"Fullname  : ",  "Fullname",  h_composer_abook_full, 12, 0, NULL,
-   NULL,          NULL, NULL, view_message_for_pico,   "To Message", NULL,
+   NULL,          NULL, NULL, view_message_for_pico,   "ƧX", NULL,
    1, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
   {"Fcc       : ",  "FileCopy",  h_composer_abook_fcc, 12, 0, NULL,
-   NULL,          NULL, NULL, folders_for_fcc,         "To Fldrs", NULL,
+   NULL,          NULL, NULL, folders_for_fcc,         "ƧX", NULL,
    1, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
   {"Comment   : ",  "Comment",   h_composer_abook_comment, 12, 0, NULL,
-   NULL,          NULL, NULL, view_message_for_pico,   "To Message", NULL,
+   NULL,          NULL, NULL, view_message_for_pico,   "ƧX", NULL,
    1, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
   {"Addresses : ",  "Addresses", h_composer_abook_addrs, 12, 0, NULL,
-   verify_addr,   NULL, NULL, addr_book_change_list,   "To AddrBk", NULL,
+   verify_addr,   NULL, NULL, addr_book_change_list,   "a}ï", NULL,
    1, 1, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
   {NULL, NULL, NO_HELP, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE}
@@@@ -963,7 +963,7 @@@@
     pbuf.canceltest    = warped ? pico_cancel_for_adrbk_edit
 				: pico_cancel_for_adrbk_take;
     pbuf.expander      = expand_addrs_for_pico;
-    pbuf.ctrlr_label   = "RichView";
+    pbuf.ctrlr_label   = "Y";//"RichView";
     pbuf.resize	       = resize_for_pico;
     pbuf.winch_cleanup = winch_cleanup;
     pbuf.suspend       = do_suspend;
@@@@ -979,7 +979,7 @@@@
     pbuf.browse_help   = h_composer_browse;
     pbuf.attach_help   = h_composer_ctrl_j;
     pbuf.composer_help = h_composer;
-    sprintf(titlebar, "ADDRESS BOOK (%c%s)",
+    sprintf(titlebar, "a}ï (%c%s)",
 	    readonly ? 'V' : islower((unsigned char)(*cmd))
 				    ? toupper((unsigned char)*cmd)
 				    : *cmd,
@@@@ -1574,12 +1574,12 @@@@
     ps_global->redrawer = redraw_pico;
     fix_windsize(ps_global);
     
-    switch(want_to("Exit and save changes ", 'y', 0, NO_HELP, WT_NORM)){
+    switch(want_to("sɨ} ", 'y', 0, NO_HELP, WT_NORM)){
       case 'y':
 	break;
 
       case 'n':
-	rstr = "Use ^C to abandon changes you've made";
+	rstr = "H ^C 󴿰L";
 	break;
     }
 
@@@@ -1603,8 +1603,8 @@@@
     char *rstr = NULL;
     void (*redraw)() = ps_global->redrawer;
 
-    strcat(strcat(strcpy(prompt, "Cancel "), word),
-	   " (answering \"Yes\" will abandon any changes made) ");
+    strcat(strcat(strcpy(prompt, ""), word),
+	   " (^ \"O\" N󴿧@@L) ");
     ps_global->redrawer = redraw_pico;
     fix_windsize(ps_global);
     
@@@@ -1627,7 +1627,7 @@@@
 pico_cancel_for_adrbk_take(redraw_pico)
     void (*redraw_pico)();
 {
-    return(pico_cancelexit_for_adrbk("take", redraw_pico));
+    return(pico_cancelexit_for_adrbk("^", redraw_pico));
 }
 
 
@@@@ -1635,7 +1635,7 @@@@
 pico_cancel_for_adrbk_edit(redraw_pico)
     void (*redraw_pico)();
 {
-    return(pico_cancelexit_for_adrbk("changes", redraw_pico));
+    return(pico_cancelexit_for_adrbk("ק", redraw_pico));
 }
 
 
@@@@ -1752,16 +1752,16 @@@@
 
     if(ps_global->readonly_pinerc){
 	q_status_message1(SM_ORDER, 0, 3,
-			  "%s cancelled: config file not changeable",
-			  edit ? "Change" : "Add");
+			  "%sG]wɵLkQק",
+			  edit ? "ק" : "sW");
 	return -1;
     }
 
     if(global && vars[V_GLOB_ADDRBOOK].is_fixed ||
        !global && vars[V_ADDRESSBOOK].is_fixed){
 	q_status_message1(SM_ORDER, 0, 3,
-	     "Cancelled: Sys. Mgmt. does not allow changing %saddress books",
-	     global ? "global " : "");
+	     "ʧ@@Gtκ޲z\\%sa}ï",
+	     global ? "骺" : "");
 	
 	return -1;
     }
@@@@ -1811,7 +1811,7 @@@@
     pbuf.browse_help   = h_composer_browse;
     pbuf.attach_help   = h_composer_ctrl_j;
     pbuf.composer_help = h_composer;
-    sprintf(titlebar, "%s ADDRESS BOOK", edit ? "CHANGE" : "ADD");
+    sprintf(titlebar, "%sa}ï", edit ? "ק" : "sW");
     pbuf.pine_anchor   = set_titlebar(titlebar,
 				      ps_global->mail_stream,
 				      ps_global->context_current,
@@@@ -1932,8 +1932,8 @@@@
     if(editor_result & COMP_CANCEL){
 	ret = -1;
 	q_status_message1(SM_ORDER, 0, 3,
-			  "Address book %s is cancelled",
-			  edit ? "change" : "add");
+			  "a}ï%s",
+			  edit ? "ק" : "sW");
     }
     else if(editor_result & COMP_EXIT){
 	if(!strcmp(server, def_serv ? def_serv : "") &&
@@@@ -1941,8 +1941,8 @@@@
 	   !strcmp(nickname, def_nick ? def_nick : "")){
 	    ret = -1;
 	    q_status_message1(SM_ORDER, 0, 3,
-			      "No change: Address book %s is cancelled",
-			      edit ? "change" : "add");
+			      "SܡGa}ï%s",
+			      edit ? "ק" : "sW");
 	}
 	else{
 
@@@@ -2009,8 +2009,8 @@@@
 
 	    if(*tmp == '\0'){
 		q_status_message1(SM_ORDER, 0, 3,
-				 "Address book %s is cancelled",
-				 edit ? "change" : "add");
+				 "a}ï%s",
+				 edit ? "ק" : "sW");
 		ret = -1;
 		goto get_out;
 	    }
@@@@ -2035,8 +2035,8 @@@@
 	    if(set_variable_list(global ? V_GLOB_ADDRBOOK : V_ADDRESSBOOK,
 				 new_list, TRUE)){
 		q_status_message1(SM_ORDER, 0, 3,
-			"%s cancelled: couldn't save pine configuration file",
-			edit ? "Change" : "Add");
+			"%sGLksJ pine ]w",
+			edit ? "ק" : "sW");
 
 		set_current_val(&vars[global ? V_GLOB_ADDRBOOK : V_ADDRESSBOOK],
 				TRUE, FALSE);
@@@@ -2209,7 +2209,7 @@@@
 
     if(ps_global->readonly_pinerc){
 	if(err)
-	  *err = "Delete cancelled: config file not changeable";
+	  *err = "RG]wɵLkQ";
 	
 	return -1;
     }
@@@@ -2226,10 +2226,10 @@@@
 	if(err){
 	    if(pab->type & GLOBAL)
 	      *err =
-    "Cancelled: Sys. Mgmt. does not allow changing global address book config";
+    "ʧ@@Gtκ޲z\\ܾ骺a}ï]w";
 	    else
 	      *err =
-    "Cancelled: Sys. Mgmt. does not allow changing address book config";
+    "ʧ@@Gtκ޲z\\ܦa}ï]w";
 	}
 
 	return -1;
@@@@ -2282,8 +2282,8 @@@@
 	
 	if(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}};
 
 	    sprintf(tmp,
@@@@ -2301,7 +2301,7 @@@@
 		
 	      case 'x':
 		if(err)
-		  *err = "Delete cancelled";
+		  *err = "R";
 
 		return -1;
 	    }
@@@@ -2312,7 +2312,7 @@@@
 	      case 'n':
 	      case 'x':
 	        if(err)
-		  *err = "Delete cancelled";
+		  *err = "R";
 
 	        return -1;
 	    
@@@@ -2357,7 +2357,7 @@@@
 	  case 'x':				/* Cancel */
 	  default:
 	    if(err)
-	      *err = "Delete cancelled";
+	      *err = "R";
 
 	    return -1;
 	}
@@@@ -2377,7 +2377,7 @@@@
           case 'x':
 	  default:
 	    if(err)
-	      *err = "Delete cancelled";
+	      *err = "R";
 
 	    return -1;
 	
@@@@ -2438,7 +2438,7 @@@@
 		  case 'n':
 		  default:
 		    if(err)
-		      *err = "Delete cancelled";
+		      *err = "R";
 
 		    return -1;
 		}
@@@@ -2577,7 +2577,7 @@@@
     /* this also frees old variable contents for us */
     if(set_variable_list(varnum, new_list, TRUE)){
 	if(err)
-	  *err = "Delete cancelled: couldn't save pine configuration file";
+	  *err = "RGLksJ pine ]w";
 
 	set_current_val(&vars[varnum], TRUE, FALSE);
 	free_list_array(&new_list);
@@@@ -2644,7 +2644,7 @@@@
 
     if(ps_global->readonly_pinerc){
 	if(msg)
-	  *msg = cpystr("Shuffle cancelled: config file not changeable");
+	  *msg = cpystr("G]wɵLkQ");
 	
 	return -1;
     }
@@@@ -2654,12 +2654,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';
@@@@ -2667,7 +2667,7 @@@@
     if(pab->type & GLOBAL){
 	if(vars[V_GLOB_ADDRBOOK].is_fixed){
 	    if(msg)
-	      *msg = cpystr("Cancelled: Sys. Mgmt. does not allow changing global address book config");
+	      *msg = cpystr("ʧ@@Gtκ޲z\\ܾ骺a}ï]w");
 	    
 	    return -1;
 	}
@@@@ -2687,7 +2687,7 @@@@
     else{
 	if(vars[V_ADDRESSBOOK].is_fixed){
 	    if(msg)
-	      *msg = cpystr("Cancelled: Sys. Mgmt. does not allow changing address book config");
+	      *msg = cpystr("ʧ@@Gtκ޲z\\ܦa}ï]w");
 	    
 	    return -1;
 	}
@@@@ -2726,7 +2726,7 @@@@
 
     if(rv == 'x'){
 	if(msg)
-	  *msg = cpystr("Shuffle cancelled");
+	  *msg = cpystr("");
 	
 	return -1;
     }
@@@@ -2769,7 +2769,7 @@@@
     enum {NotSet, Pers, Glob, Empty} type1, type2;
     int          i, j, retval = -1;
     struct variable *vars = ps_global->vars;
-    char *cancel_msg = "Shuffle cancelled: couldn't save configuration file";
+    char *cancel_msg = "GLksJ]w";
 
     dprint(5, (debugfile, "- do_the_shuffle(%d, %d) -\n", anum1, anum2));
 
@@@@ -2783,7 +2783,7 @@@@
     if(type1 == Empty){
 	if(msg)
 	  *msg =
-	      cpystr("Shuffle cancelled: highlight entry you wish to shuffle");
+	      cpystr("GХХܱ㪺");
 
 	return(retval);
     }
@@@@ -2800,14 +2800,14 @@@@
 
     if((type1 == Pers || type2 == Pers) && vars[V_ADDRESSBOOK].is_fixed){
 	if(msg)
-	  *msg = cpystr("Cancelled: Sys. Mgmt. does not allow changing address book configuration");
+	  *msg = cpystr("ʧ@@Gtκ޲z\\ܦa}ï]w");
 
 	return(retval);
     }
 
     if((type1 == Glob || type2 == Glob) && vars[V_GLOB_ADDRBOOK].is_fixed){
 	if(msg)
-	  *msg = cpystr("Cancelled: Sys. Mgmt. does not allow changing global address book config");
+	  *msg = cpystr("ʧ@@Gtκ޲z\\ܾ骺a}ï]w");
 
 	return(retval);
     }
@@@@ -3312,7 +3312,7 @@@@
     AdrBk_Entry *abe;
     VCARD_INFO_S *vinfo;
     static ESCKEY_S ab_export_opts[] = {
-	{ctrl('T'), 10, "^T", "To Files"},
+	{ctrl('T'), 10, "^T", "ɮצC"},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL}};
     static ESCKEY_S vcard_or_addresses[] = {
@@@@ -3335,7 +3335,7 @@@@
 
     switch(i){
       case 'x':
-	cancel_warning(NO_DING, "export");
+	cancel_warning(NO_DING, "ץX");
 	return(ret);
     
       case 'a':
@@@@ -3364,7 +3364,7 @@@@
 	ab_export_opts[++r].ch  =  ctrl('I');
 	ab_export_opts[r].rval  = 11;
 	ab_export_opts[r].name  = "TAB";
-	ab_export_opts[r].label = "Complete";
+	ab_export_opts[r].label = "";
     }
 
     ab_export_opts[++r].ch = -1;
@@@@ -3377,7 +3377,7 @@@@
     if(r < 0){
 	switch(r){
 	  case -1:
-	    cancel_warning(NO_DING, "export");
+	    cancel_warning(NO_DING, "ץX");
 	    break;
 
 	  case -2:
@@@@ -3787,7 +3787,7 @@@@
 	    switch(want_to("Expand nicknames", 'y', 'x', h_ab_forward,WT_NORM)){
 	      case 'x':
 		gf_clear_so_writec((STORE_S *) pb->contents.text.data);
-		cancel_warning(NO_DING, "forward");
+		cancel_warning(NO_DING, "H");
 		goto bomb;
 		
 	      case 'y':
@@@@ -3871,7 +3871,7 @@@@
 
     gf_clear_so_writec((STORE_S *) pb->contents.text.data);
 
-    pine_send(outgoing, &body, "FORWARDING ADDRESS BOOK ENTRY", role, NULL,
+    pine_send(outgoing, &body, "Ha}ï", role, NULL,
  	      NULL, NULL, NULL, NULL, 0);
     
     ps->mangled_screen = 1;
@@@@ -4339,8 +4339,8 @@@@
     char           tmp[200];
     ACTION_LIST_S *action_list = NULL, *al;
     static ESCKEY_S save_or_export[] = {
-	{'s', 's', "S", "Save"},
-	{'e', 'e', "E", "Export"},
+	{'s', 's', "S", "s"},
+	{'e', 'e', "E", "ץX"},
 	{-1, 0, NULL, NULL}};
 
     sprintf(tmp, "Save%s to address book or Export to filesystem ? ",
@@@@ -4351,7 +4351,7 @@@@
 		      h_ab_save_exp, RB_NORM);
     switch(i){
       case 'x':
-	cancel_warning(NO_DING, "save");
+	cancel_warning(NO_DING, "s");
 	return(0);
 
       case 'e':
@@@@ -4534,7 +4534,7 @@@@
 		if(action_list)
 		  fs_give((void **)&action_list);
 
-		cancel_warning(NO_DING, "save");
+		cancel_warning(NO_DING, "s");
 		return(ret);
 	    }
 
@@@@ -4715,7 +4715,7 @@@@
 	  q_status_message(SM_ORDER | SM_DING, 3, 4,
 			   "Save only partially completed");
 	else
-	  cancel_warning(NO_DING, "save");
+	  cancel_warning(NO_DING, "s");
     }
     else if (how_many_to_copy + how_many_no_action -
 	     (skip_dups ? how_many_dups : 0) > 0){
@@@@ -4792,15 +4792,15 @@@@
     curopen = cur_is_open();
     if(!agg && curopen){
 	static ESCKEY_S prt[] = {
-	    {'a', 'a', "A", "AddressBook"},
-	    {'e', 'e', "E", "Entry"},
+	    {'a', 'a', "A", "a}ï"},
+	    {'e', 'e', "E", ""},
 	    {-1, 0, NULL, NULL}};
 
 	prompt = "Print Address Book or just this Entry? ";
 	switch(radio_buttons(prompt, -FOOTER_ROWS(ps_global), prt, 'a', 'x',
 			     NO_HELP, RB_NORM)){
 	  case 'x' :
-	    cancel_warning(NO_DING, "print");
+	    cancel_warning(NO_DING, "CL");
 	    ps_global->mangled_footer = 1;
 	    return 0;
 
@@@@ -4871,7 +4871,7 @@@@
 		    switch(want_to("Expand nicknames", 'y', 'x', h_ab_forward,
 								    WT_NORM)){
 		      case 'x':
-			cancel_warning(NO_DING, "print");
+			cancel_warning(NO_DING, "CL");
 			ps_global->mangled_footer = 1;
 			return 0;
 			
@@@@ -5145,7 +5145,7 @@@@
 		    if(F_ON(F_CMBND_ABOOK_DISP,ps_global))
 		      lineno = 0L - XTRA_TITLE_LINES_IN_OLD_ABOOK_DISP;
 		    else{
-			print_text1("      ADDRESS BOOK %s\n\n",
+			print_text1("      a}ï %s\n\n",
 				    as.adrbks[as.cur].nickname);
 			lineno = 0L;
 		    }
@@@@ -5211,7 +5211,7 @@@@
     dprint(2, (debugfile, "- ab_agg_delete -\n"));
 
     if(agg){
-	sprintf(prompt, "Really delete %d selected entries", as.selections);
+	sprintf(prompt, "TwR %d ", as.selections);
 	ch = want_to(prompt, 'n', 'n', NO_HELP, WT_NORM);
 	if(ch == 'y'){
 	    adrbk_cntr_t   newelnum, flushelnum = NO_NEXT;
@@@@ -5378,7 +5378,7 @@@@
 	    }
 	}
 	else
-	  cmd_cancelled("Apply Delete command");
+	  cmd_cancelled("MΧRRO");
     }
 
     return(ret);
@@@@ -5426,7 +5426,7 @@@@
 			? (char *)rfc1522_decode((unsigned char *)tmp_20k_buf,
 						    abe->fullname, NULL)
 			: abe->nickname ? abe->nickname : "";
-        cmd   = "Really delete \"%.50s\"";
+        cmd   = "TwR \"%.50s\"";
         break;
 
       case ListHead:
@@@@ -5434,13 +5434,13 @@@@
 			? (char *)rfc1522_decode((unsigned char *)tmp_20k_buf,
 						    abe->fullname, NULL)
 			: abe->nickname ? abe->nickname : "";
-	cmd   = "Really delete ENTIRE list \"%.50s\"";
+	cmd   = "TwRuӡvC \"%.50s\"";
         break;
 
       case ListEnt:
         dname = (char *)rfc1522_decode((unsigned char *)tmp_20k_buf,
 					    listmem_from_dl(abook, dl), NULL);
-	cmd   = "Really delete \"%.100s\" from list";
+	cmd   = "TwۦCR \"%.100s\"";
         break;
     } 
 
@@@@ -5539,7 +5539,7 @@@@
 	return 0;
     }
     else{
-	q_status_message(SM_INFO, 0, 2, "Entry not deleted");
+	q_status_message(SM_INFO, 0, 2, "ӶإQR");
 	return 0;
     }
 }
@@@@ -5675,7 +5675,7 @@@@
     if(r == 1 || r != 10 && fbuf[0] == '\0'){
 	ps->mangled_footer = 1;
 	if(error)
-	  *error = cpystr("Cancelled");
+	  *error = cpystr("");
 
 	return(ret);
     }
@@@@ -5716,7 +5716,7 @@@@
 	pbuf.browse_help   = h_composer_browse;
 	pbuf.attach_help   = h_composer_ctrl_j;
 	pbuf.composer_help = h_composer;
-	pbuf.pine_anchor   = set_titlebar("SEARCH DIRECTORY SERVER",
+	pbuf.pine_anchor   = set_titlebar("jMa}A",
 					  ps_global->mail_stream,
 					  ps_global->context_current,
 					  ps_global->cur_folder,
@@@@ -5990,10 +5990,10 @@@@
 
 	HELP_MENU,
 	OTHER_MENU,
-	{"V","ViewLink",{MC_VIEW_HANDLE,3,{'v',ctrl('m'),ctrl('j')}},KS_NONE},
+	{"V","˵쵲",{MC_VIEW_HANDLE,3,{'v',ctrl('m'),ctrl('j')}},KS_NONE},
 	NULL_MENU,
-	{"^B","PrevLink",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
-	{"^F","NextLink",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
+	{"^B","e@@쵲",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
+	{"^F","@@쵲",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
 	NULL_MENU,
 	NULL_MENU,
 	NULL_MENU,
@@@@ -6027,13 +6027,13 @@@@
 	memset(&sargs, 0, sizeof(SCROLL_S));
 	sargs.text.text	  = so_text(srcstore);
 	sargs.text.src    = srctype;
-	sargs.text.desc   = "expanded entry";
+	sargs.text.desc   = "wi}";
 	sargs.text.handles= handles;
-	sargs.bar.title   = "DIRECTORY ENTRY";
+	sargs.bar.title   = "a}";
 	sargs.proc.tool   = process_ldap_cmd;
 	sargs.proc.data.p = (void *) winning_e;
 	sargs.help.text   = h_ldap_view;
-	sargs.help.title  = "HELP FOR DIRECTORY VIEW";
+	sargs.help.title  = "a}تU";
 	sargs.keys.menu   = &ldap_view_keymenu;
 	setbitmap(sargs.keys.bitmap);
 
@@@@ -6511,7 +6511,7 @@@@
     struct headerentry *he;
     void (*redraw_pico)();
 {
-    return("Cancelled");
+    return("");
 }
 
 
@


1.7
log
@Update to version 4.20.

PR:		14575
Submitted by:	maintainer
@
text
@@


1.6
log
@Update to version 4.10.

PR:		10245
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pine/adrbkcmd.c.orig	Sat Jan 30 03:57:55 1999
+++ pine/adrbkcmd.c	Mon Feb 22 22:36:14 1999
d9 1
a11 2
 	NULL_MENU,
-	{"C","ComposeTo",{MC_COMPOSE,1,{'c'}},KS_COMPOSER},
d13 1
d25 1
a25 1
+	{"V","˵s",{MC_VIEW_HANDLE,3,{'v',ctrl('m'),ctrl('j')}},KS_NONE},
d29 2
a30 2
+	{"^B","e@@s",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
+	{"^F","U@@s",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
d34 1
a34 1
@@@@ -144,7 +144,7 @@@@
d43 1
a43 1
@@@@ -153,7 +153,7 @@@@
d52 1
a52 1
@@@@ -305,15 +305,15 @@@@
d59 6
d66 1
a66 1
+	sargs.bar.title	  = "a}ï (˵)";
d77 1
a77 1
@@@@ -421,7 +421,7 @@@@
d86 1
a86 1
@@@@ -449,7 +449,7 @@@@
d95 1
a95 1
@@@@ -494,7 +494,7 @@@@
d104 1
a104 1
@@@@ -729,8 +729,8 @@@@
d115 1
a115 1
@@@@ -800,8 +800,8 @@@@
d126 1
a126 1
@@@@ -824,19 +824,19 @@@@
d151 1
a151 1
@@@@ -951,7 +951,7 @@@@
d160 1
a160 1
@@@@ -967,7 +967,7 @@@@
d169 1
a169 1
@@@@ -1559,12 +1559,12 @@@@
d184 1
a184 1
@@@@ -1588,8 +1588,8 @@@@
d195 1
a195 1
@@@@ -1612,7 +1612,7 @@@@
d204 1
a204 1
@@@@ -1620,7 +1620,7 @@@@
d213 1
a213 1
@@@@ -1737,16 +1737,16 @@@@
d234 1
a234 1
@@@@ -1796,7 +1796,7 @@@@
d243 1
a243 1
@@@@ -1916,8 +1916,8 @@@@
d254 1
a254 1
@@@@ -1925,8 +1925,8 @@@@
d265 1
a265 1
@@@@ -1993,8 +1993,8 @@@@
d276 1
a276 1
@@@@ -2019,8 +2019,8 @@@@
d287 1
a287 1
@@@@ -2191,7 +2191,7 @@@@
d296 1
a296 1
@@@@ -2208,10 +2208,10 @@@@
d309 1
a309 1
@@@@ -2264,8 +2264,8 @@@@
d320 1
a320 1
@@@@ -2283,7 +2283,7 @@@@
d329 1
a329 1
@@@@ -2294,7 +2294,7 @@@@
d338 1
a338 1
@@@@ -2339,7 +2339,7 @@@@
d347 1
a347 1
@@@@ -2359,7 +2359,7 @@@@
d356 1
a356 1
@@@@ -2420,7 +2420,7 @@@@
d365 1
a365 1
@@@@ -2559,7 +2559,7 @@@@
d374 1
a374 1
@@@@ -2626,7 +2626,7 @@@@
d383 1
a383 1
@@@@ -2636,12 +2636,12 @@@@
d398 1
a398 1
@@@@ -2649,7 +2649,7 @@@@
d407 1
a407 1
@@@@ -2669,7 +2669,7 @@@@
d416 1
a416 1
@@@@ -2708,7 +2708,7 @@@@
d425 1
a425 1
@@@@ -2751,7 +2751,7 @@@@
d434 1
a434 1
@@@@ -2765,7 +2765,7 @@@@
d443 1
a443 1
@@@@ -2782,14 +2782,14 @@@@
d460 1
a460 1
@@@@ -3261,7 +3261,7 @@@@
d469 1
a469 1
@@@@ -3284,7 +3284,7 @@@@
d478 1
a478 1
@@@@ -3313,7 +3313,7 @@@@
d487 1
a487 1
@@@@ -3326,7 +3326,7 @@@@
d496 1
a496 1
@@@@ -3711,7 +3711,7 @@@@
d505 1
a505 1
@@@@ -3795,7 +3795,7 @@@@
d509 2
a510 2
-    pine_send(outgoing, &body, "FORWARDING ADDRESS BOOK ENTRY", NULL, NULL,
+    pine_send(outgoing, &body, "Ha}ï", NULL, NULL,
d514 1
a514 1
@@@@ -4262,8 +4262,8 @@@@
d525 1
a525 1
@@@@ -4274,7 +4274,7 @@@@
d534 1
a534 1
@@@@ -4457,7 +4457,7 @@@@
d543 1
a543 1
@@@@ -4638,7 +4638,7 @@@@
d552 1
a552 1
@@@@ -4715,15 +4715,15 @@@@
d571 1
a571 1
@@@@ -4794,7 +4794,7 @@@@
d580 1
a580 1
@@@@ -5068,7 +5068,7 @@@@
d589 1
a589 1
@@@@ -5134,7 +5134,7 @@@@
d598 1
a598 1
@@@@ -5301,7 +5301,7 @@@@
d607 1
a607 1
@@@@ -5349,7 +5349,7 @@@@
d616 1
a616 1
@@@@ -5357,13 +5357,13 @@@@
d632 1
a632 1
@@@@ -5462,7 +5462,7 @@@@
d641 1
a641 1
@@@@ -5598,7 +5598,7 @@@@
d650 1
a650 1
@@@@ -5638,7 +5638,7 @@@@
d659 1
a659 1
@@@@ -5895,14 +5895,14 @@@@
d661 2
a662 2
 static struct key ldap_view_keys[] =
        {HELP_MENU,
a663 1
-	{"<","Results Index",{MC_EXIT,2,{'<',','}},KS_NONE},
d665 1
a665 2
+	{"<","G",{MC_EXIT,2,{'<',','}},KS_NONE},
 	PRYNTTXT_MENU,
d670 4
a673 8
 	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};
@@@@ -5935,13 +5935,13 @@@@
d690 1
a690 1
@@@@ -6412,7 +6412,7 @@@@
@


1.5
log
@Update to version 4.05.

PR:		8025
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pine/adrbkcmd.c.orig	Wed Sep 16 06:11:08 1998
+++ pine/adrbkcmd.c	Tue Sep 22 18:58:32 1998
d124 3
a126 4
-   verify_nick,   NULL, NULL, addr_book_nick_for_edit, "To AddrBk",
-   1, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
+   verify_nick,   NULL, NULL, addr_book_nick_for_edit, "a}ï",
+   1, 0, 0, 0, 0, 1, 0, 0, 0, 0, KS_NONE},
d128 2
a129 2
-   NULL,          NULL, NULL, view_message_for_pico,   "To Message",
+   NULL,          NULL, NULL, view_message_for_pico,   "ƧX",
d132 3
a134 4
-   NULL,          NULL, NULL, folders_for_fcc,         "To Fldrs",
-   1, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
+   NULL,          NULL, NULL, folders_for_fcc,         "ƧX",
+   1, 0, 0, 0, 1, 1, 0, 0, 0, 0, KS_NONE},
d136 2
a137 2
-   NULL,          NULL, NULL, view_message_for_pico,   "To Message",
+   NULL,          NULL, NULL, view_message_for_pico,   "ƧX",
d140 2
a141 2
-   verify_addr,   NULL, NULL, addr_book_change_list,   "To AddrBk",
+   verify_addr,   NULL, NULL, addr_book_change_list,   "a}ï",
d143 1
a143 1
   {NULL, NULL, NO_HELP, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL,
d154 1
a154 1
@@@@ -966,7 +966,7 @@@@
d163 1
a163 1
@@@@ -1551,12 +1551,12 @@@@
d178 1
a178 1
@@@@ -1580,8 +1580,8 @@@@
d189 1
a189 1
@@@@ -1604,7 +1604,7 @@@@
d198 1
a198 1
@@@@ -1612,7 +1612,7 @@@@
d207 1
a207 1
@@@@ -1729,16 +1729,16 @@@@
d228 1
a228 1
@@@@ -1787,7 +1787,7 @@@@
d237 1
a237 1
@@@@ -1856,8 +1856,8 @@@@
d248 1
a248 1
@@@@ -1865,8 +1865,8 @@@@
d259 1
a259 1
@@@@ -1936,8 +1936,8 @@@@
d270 1
a270 1
@@@@ -1962,8 +1962,8 @@@@
d281 1
a281 1
@@@@ -2137,7 +2137,7 @@@@
d290 1
a290 1
@@@@ -2154,10 +2154,10 @@@@
d303 1
a303 1
@@@@ -2210,8 +2210,8 @@@@
d314 1
a314 1
@@@@ -2229,7 +2229,7 @@@@
d323 1
a323 1
@@@@ -2240,7 +2240,7 @@@@
d332 1
a332 1
@@@@ -2285,7 +2285,7 @@@@
d341 1
a341 1
@@@@ -2305,7 +2305,7 @@@@
d350 1
a350 1
@@@@ -2366,7 +2366,7 @@@@
d359 1
a359 1
@@@@ -2505,7 +2505,7 @@@@
d368 1
a368 1
@@@@ -2572,7 +2572,7 @@@@
d377 1
a377 1
@@@@ -2582,12 +2582,12 @@@@
d392 1
a392 1
@@@@ -2595,7 +2595,7 @@@@
d401 1
a401 1
@@@@ -2615,7 +2615,7 @@@@
d410 1
a410 1
@@@@ -2654,7 +2654,7 @@@@
d419 1
a419 1
@@@@ -2697,7 +2697,7 @@@@
d428 1
a428 1
@@@@ -2711,7 +2711,7 @@@@
d437 1
a437 1
@@@@ -2728,14 +2728,14 @@@@
d454 1
a454 1
@@@@ -3207,7 +3207,7 @@@@
d463 1
a463 1
@@@@ -3230,7 +3230,7 @@@@
d472 1
a472 1
@@@@ -3259,7 +3259,7 @@@@
d481 1
a481 1
@@@@ -3272,7 +3272,7 @@@@
d490 1
a490 1
@@@@ -3656,7 +3656,7 @@@@
d499 1
a499 1
@@@@ -3740,7 +3740,7 @@@@
d503 2
a504 2
-    pine_send(outgoing, &body, "FORWARDING ADDRESS BOOK ENTRY", NULL,
+    pine_send(outgoing, &body, "Ha}ï", NULL,
d508 1
a508 1
@@@@ -4207,8 +4207,8 @@@@
d519 1
a519 1
@@@@ -4219,7 +4219,7 @@@@
d528 1
a528 1
@@@@ -4405,7 +4405,7 @@@@
d537 1
a537 1
@@@@ -4594,7 +4594,7 @@@@
d546 3
a548 3
@@@@ -4670,15 +4670,15 @@@@
 
     if(!agg && as.opened){
d565 1
a565 1
@@@@ -4749,7 +4749,7 @@@@
d574 11
a584 11
@@@@ -4973,7 +4973,7 @@@@
 		lineno = 0L;
 
 		if(as.opened)
-		  print_text1("      ADDRESS BOOK %s\n\n",
+		  print_text1("      a}ï %s\n\n",
 			      as.adrbks[as.cur].nickname);
 
 
@@@@ -5028,7 +5028,7 @@@@
     dprint(2, (debugfile, "- ab_delete -\n"));
d592 1
a592 1
@@@@ -5193,7 +5193,7 @@@@
d596 2
a597 2
-	  cmd_cancelled("Apply command");
+	  cmd_cancelled("MΩRO");
d601 1
a601 1
@@@@ -5241,7 +5241,7 @@@@
d610 1
a610 1
@@@@ -5249,13 +5249,13 @@@@
d626 1
a626 1
@@@@ -5354,7 +5354,7 @@@@
d635 1
a635 1
@@@@ -5490,7 +5490,7 @@@@
d644 1
a644 1
@@@@ -5529,7 +5529,7 @@@@
d653 2
a654 1
@@@@ -5777,13 +5777,13 @@@@
d657 1
a657 1
 	NULL_MENU,
d659 1
d662 4
a665 2
 	NULL_MENU,
 	NULL_MENU,
d673 1
a673 1
@@@@ -5812,12 +5812,12 @@@@
d678 2
a680 1
+	sargs.text.desc   = "wi}";
d690 1
a690 1
@@@@ -6174,7 +6174,7 @@@@
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pine/adrbkcmd.c.orig	Sat Jul 11 01:32:16 1998
+++ pine/adrbkcmd.c	Tue Aug  4 12:42:16 1998
d52 1
a52 1
@@@@ -301,15 +301,15 @@@@
d71 1
a71 1
@@@@ -405,7 +405,7 @@@@
d80 1
a80 1
@@@@ -433,7 +433,7 @@@@
d89 1
a89 1
@@@@ -478,7 +478,7 @@@@
d95 1
d98 1
a98 2
 	  case 't':
@@@@ -704,8 +704,8 @@@@
d109 1
a109 1
@@@@ -772,8 +772,8 @@@@
d120 1
a120 1
@@@@ -796,19 +796,19 @@@@
d147 1
a147 1
@@@@ -923,7 +923,7 @@@@
d156 1
a156 1
@@@@ -938,7 +938,7 @@@@
d165 1
a165 1
@@@@ -1523,12 +1523,12 @@@@
d180 1
a180 1
@@@@ -1552,8 +1552,8 @@@@
d191 1
a191 1
@@@@ -1576,7 +1576,7 @@@@
d200 1
a200 1
@@@@ -1584,7 +1584,7 @@@@
d209 1
a209 1
@@@@ -1701,16 +1701,16 @@@@
d230 1
a230 1
@@@@ -1759,7 +1759,7 @@@@
d239 1
a239 1
@@@@ -1828,8 +1828,8 @@@@
d250 1
a250 1
@@@@ -1837,8 +1837,8 @@@@
d261 1
a261 1
@@@@ -1898,8 +1898,8 @@@@
d272 1
a272 1
@@@@ -1924,8 +1924,8 @@@@
d283 1
a283 1
@@@@ -2099,7 +2099,7 @@@@
d292 1
a292 1
@@@@ -2116,10 +2116,10 @@@@
d305 1
a305 1
@@@@ -2172,8 +2172,8 @@@@
d316 1
a316 1
@@@@ -2191,7 +2191,7 @@@@
d325 1
a325 1
@@@@ -2202,7 +2202,7 @@@@
d334 1
a334 1
@@@@ -2247,7 +2247,7 @@@@
d343 1
a343 1
@@@@ -2267,7 +2267,7 @@@@
d352 1
a352 1
@@@@ -2328,7 +2328,7 @@@@
d361 1
a361 1
@@@@ -2467,7 +2467,7 @@@@
d370 1
a370 1
@@@@ -2534,7 +2534,7 @@@@
d379 1
a379 1
@@@@ -2544,12 +2544,12 @@@@
d394 1
a394 1
@@@@ -2557,7 +2557,7 @@@@
d403 1
a403 1
@@@@ -2577,7 +2577,7 @@@@
d412 1
a412 1
@@@@ -2616,7 +2616,7 @@@@
d421 1
a421 1
@@@@ -2659,7 +2659,7 @@@@
d423 1
a423 1
     int          i, j;
d430 1
a430 1
@@@@ -2673,7 +2673,7 @@@@
d437 1
a437 1
 	return -1;
d439 1
a439 1
@@@@ -2690,14 +2690,14 @@@@
d446 1
a446 1
 	return -1;
d454 1
a454 1
 	return -1;
d456 1
a456 1
@@@@ -3167,7 +3167,7 @@@@
d465 1
a465 1
@@@@ -3190,7 +3190,7 @@@@
d474 1
a474 1
@@@@ -3219,7 +3219,7 @@@@
d483 1
a483 1
@@@@ -3232,7 +3232,7 @@@@
d492 1
a492 1
@@@@ -3616,7 +3616,7 @@@@
d501 1
a501 1
@@@@ -3700,7 +3700,7 @@@@
d510 1
a510 1
@@@@ -4165,8 +4165,8 @@@@
d521 1
a521 1
@@@@ -4177,7 +4177,7 @@@@
d530 1
a530 1
@@@@ -4356,7 +4356,7 @@@@
d539 1
a539 1
@@@@ -4545,7 +4545,7 @@@@
d548 1
a548 1
@@@@ -4621,15 +4621,15 @@@@
d567 1
a567 1
@@@@ -4700,7 +4700,7 @@@@
d576 1
a576 1
@@@@ -4924,7 +4924,7 @@@@
d585 1
a585 1
@@@@ -4979,7 +4979,7 @@@@
d594 1
a594 1
@@@@ -5144,7 +5144,7 @@@@
d603 1
a603 1
@@@@ -5192,7 +5192,7 @@@@
d612 1
a612 1
@@@@ -5200,13 +5200,13 @@@@
d628 1
a628 1
@@@@ -5305,7 +5305,7 @@@@
d637 1
a637 1
@@@@ -5441,7 +5441,7 @@@@
d646 1
a646 1
@@@@ -5480,7 +5480,7 @@@@
d655 1
a655 1
@@@@ -5728,13 +5728,13 @@@@
d671 1
a671 1
@@@@ -5763,12 +5763,12 @@@@
d687 1
a687 1
@@@@ -6117,7 +6117,7 @@@@
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 26
a26 10
--- pine/help.c.orig	Wed Jul  1 06:22:26 1998
+++ pine/help.c	Tue Jul 28 08:35:02 1998
@@@@ -50,15 +50,15 @@@@
 
 static struct key help_keys[] =
        {MAIN_MENU,
-	{"E","Exit Help",{MC_EXIT,1,{'e'}}, KS_EXITMODE},
+	{"E","}",{MC_EXIT,1,{'e'}}, KS_EXITMODE},
 	{NULL,NULL,{MC_EXIT,1,{'e'}}, KS_EXITMODE},
 	{NULL,NULL,{MC_VIEW_HANDLE,3,{'v',ctrl('m'),ctrl('j')}},KS_NONE},
d30 7
a36 6
+	{"^F","@@s",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
 	PRYNTMSG_MENU,
-	{"Z","Print All",{MC_PRINTALL,1,{'z'}},KS_NONE},
+	{"Z","CL",{MC_PRINTALL,1,{'z'}},KS_NONE},
d38 2
a39 8
 	WHEREIS_MENU};
 INST_KEY_MENU(help_keymenu, help_keys);
@@@@ -77,7 +77,7 @@@@
 static struct key gripe_modal_keys[] = 
        {NULL_MENU,
 	NULL_MENU,
-	{"Ret","Finished",{MC_EXIT,2,{ctrl('m'),ctrl('j')}},KS_NONE},
+	{"Ret","",{MC_EXIT,2,{ctrl('m'),ctrl('j')}},KS_NONE},
d43 27
a69 16
@@@@ -269,7 +269,7 @@@@
 		memset(&sargs, 0, sizeof(SCROLL_S));
 		sargs.text.text	   = so_text(store);
 		sargs.text.src	   = CharStar;
-		sargs.text.desc	   = "help text";
+		sargs.text.desc	   = "Ur";
 		sargs.text.handles = handles;
 		if(!(sargs.bar.title = title)){
 		    if(!struncmp(shown_text[0], "<html>", 6)){
@@@@ -297,7 +297,7 @@@@
 		    }
 
 		    if(!sargs.bar.title)
-		      sargs.bar.title = "HELP TEXT";
+		      sargs.bar.title = "Ur";
 		}
d71 18
a88 17
 		sargs.bar.style	   = TextPercent;
@@@@ -313,13 +313,13 @@@@
 		setbitmap(sargs.keys.bitmap);
 		if(flags & HLPD_FROMHELP){
 		    km.keys[HLP_EXIT_KEY].name	     = "P";
-		    km.keys[HLP_EXIT_KEY].label	     = "Prev Help";
+		    km.keys[HLP_EXIT_KEY].label	     = "e@@";
 		    km.keys[HLP_EXIT_KEY].bind.cmd   = MC_FINISH;
 		    km.keys[HLP_EXIT_KEY].bind.ch[0] = 'p';
 		}
 		else{
 		    km.keys[HLP_EXIT_KEY].name	     = "E";
-		    km.keys[HLP_EXIT_KEY].label	     = "Exit Help";
+		    km.keys[HLP_EXIT_KEY].label	     = "}";
 		    km.keys[HLP_EXIT_KEY].bind.cmd   = MC_EXIT;
 		    km.keys[HLP_EXIT_KEY].bind.ch[0] = 'e';
 		    clrbitn(HLP_SUBEXIT_KEY, sargs.keys.bitmap);
d90 168
d259 21
d281 10
a290 3
 	sparms->keys.menu->keys[HLP_VIEW_HANDLE].name  = "V";
-	sparms->keys.menu->keys[HLP_VIEW_HANDLE].label = "[View Link]";
+	sparms->keys.menu->keys[HLP_VIEW_HANDLE].label = "[˵s]";
d292 30
a321 1
 }
d323 1
a323 7
@@@@ -559,7 +559,7 @@@@
 #endif
 	    if(ps_global->intr_pending){
 		q_status_message(SM_ORDER, 3, 3,
-				 "Print of all help cancelled");
+				 "CLҦU");
 		break;
d325 66
d392 141
a532 8
@@@@ -948,7 +948,7 @@@@
     memset(&sargs, 0, sizeof(SCROLL_S));
     sargs.text.text = tmp_text;
     sargs.text.src  = CharStar;
-    sargs.text.desc = "journal";
+    sargs.text.desc = "x";
     sargs.bar.title = title;
     sargs.start.on  = LastPage;
d534 3
a536 2
@@@@ -1304,7 +1304,7 @@@@
 #endif
d538 57
a594 4
 	    else if(ch == 'x'){
-		q_status_message(SM_ORDER, 0, 3, "Bug report cancelled.");
+		q_status_message(SM_ORDER, 0, 3, "~^C");
 		return(-1);
d597 99
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 14
a14 40
--- pine/mailview.c.orig	Tue Jul  7 10:05:59 1998
+++ pine/mailview.c	Wed Jul 15 17:02:35 1998
@@@@ -142,8 +142,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,
@@@@ -168,11 +168,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,
@@@@ -189,7 +189,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,
@@@@ -213,7 +213,7 @@@@
 	NEXTMSG_MENU,
d17 3
a19 8
-	{"F", "Fwd Email", {MC_FORWARD,1,{'f'}}, KS_FORWARD},
+	{"F", "HH", {MC_FORWARD,1,{'f'}}, KS_FORWARD},
 	JUMP_MENU,
 	PRYNTTXT_MENU,
 	SAVE_MENU,
@@@@ -235,7 +235,7 @@@@
 static struct key simple_text_keys[] =
        {HELP_MENU,
d21 5
a25 2
-	{"E","Exit Viewer",{MC_EXIT,1,{'e'}},KS_NONE},
+	{"E","}",{MC_EXIT,1,{'e'}},KS_NONE},
d27 2
d31 27
a57 249
@@@@ -244,7 +244,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);
 
 
@@@@ -379,7 +379,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;
 	}
@@@@ -393,7 +393,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)));
@@@@ -446,7 +446,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
@@@@ -465,11 +465,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);
@@@@ -1192,7 +1192,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);
@@@@ -1231,7 +1231,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);
 	}
@@@@ -1525,7 +1525,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);
@@@@ -1855,8 +1855,8 @@@@
     char prompt[256], tmp[MAILTMPLEN];
     int  rc, flags, local_h;
     static ESCKEY_S launch_opts[] = {
-	{'y', 'y', "Y", "Yes"},
-	{'n', 'n', "N", "No"},
+	{'y', 'y', "Y", "O"},
+	{'n', 'n', "N", "_"},
 	{-2, 0, NULL, NULL},
 	{-2, 0, NULL, NULL},
 	{0, 'u', "U", "editURL"},
@@@@ -1877,7 +1877,7 @@@@
 	else{
 	    launch_opts[5].ch = -1;
 	    if(!local_h){
-		if(want_to("No Web-Browser application defined!  Define now",
+		if(want_to("|wq Web-BrowserI{bwq",
 			   'y', 0, NO_HELP, WT_SEQ_SENSITIVE) == 'y'){
 		    /* Prompt for the displayer? */
 		    tmp[0] = '\0';
@@@@ -1921,7 +1921,7 @@@@
 				}
 				else{
 				    q_status_message1(SM_ORDER | SM_DING, 2, 2,
-						     "Browser not found: %s",
+						     "䤣sG%s",
 						     error_description(errno));
 				    continue;
 				}
@@@@ -1950,8 +1950,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)
@@@@ -2416,11 +2416,11 @@@@
 	mode = PIPE_RESET | PIPE_USER ;
 	if(syspipe = open_system_pipe(cmd, NULL, NULL, mode)){
 	    close_system_pipe(&syspipe);
-	    q_status_message(SM_ORDER, 0, 4, "VIEWER command completed");
+	    q_status_message(SM_ORDER, 0, 4, "VIEWER RO");
 	}
 	else
 	  q_status_message1(SM_ORDER, 3, 4,
-				"Cannot spawn command : %s", cmd);
+				"Lk_lROG%s", cmd);
     }
     else if(f = url_local_handler(handle->h.url.path)){
 	if((*f)(handle->h.url.path) > 1)
@@@@ -2428,7 +2428,7 @@@@
     }
     else
       q_status_message1(SM_ORDER, 2, 2,
-			"\"Web-Browser\" not defined: Can't open %s",
+			"|wq \"Web-Browser\"GLk} %s",
 			handle->h.url.path);
     
     return(rv);
@@@@ -2748,7 +2748,7 @@@@
     }
     else
       q_status_message(SM_ORDER | SM_DING, 3, 4,
-		       "Can't create space for composer");
+		       "Lks边إߪŶ");
 
     if(outgoing)
       mail_free_envelope(&outgoing);
@@@@ -2835,7 +2835,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){
@@@@ -2851,7 +2851,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){
 		/*
@@@@ -2872,9 +2872,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);
 		}
@@@@ -3013,9 +3013,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
@@@@ -3100,7 +3100,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;
@@@@ -3179,7 +3179,7 @@@@
     }
     else
       q_status_message1(SM_ORDER | SM_DING, 0, 3,
-			"Can't find fragment: %s", fragment);
+			"䤣_G%s", fragment);
 
     return(1);
 }
@@@@ -3190,10 +3190,10 @@@@
 url_local_phone_home(url)
     char *url;
 {
-    if(want_to("Request document", 'y', 0, NO_HELP, WT_FLUSH_IN) == 'y')
+    if(want_to("nD", 'y', 0, NO_HELP, WT_FLUSH_IN) == 'y')
       phone_home(url + 18);	/* 18 == length of "x-pine-phone-home:" */
     else
-      q_status_message(SM_ORDER, 0, 3, "No request sent");
+      q_status_message(SM_ORDER, 0, 3, "ШDeX");
 
     return(1);
 }
@@@@ -3210,7 +3210,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);
@@@@ -3354,7 +3354,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);
@@@@ -3604,7 +3604,7 @@@@
 		gf_set_so_writec(&tmp_pc, df_store);
 		if(errstr = dfilter(display_filter, tmp_store, tmp_pc, NULL)){
 		    q_status_message1(SM_ORDER | SM_DING, 3, 3,
-				      "Formatting error: %s", errstr);
+				      "榡~G%s", errstr);
 		    rv = FHT_WRTERR;
d60 7
a66 16
@@@@ -3616,7 +3616,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;
 	    }
 	}
@@@@ -3641,7 +3641,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);
 	    }
d69 3
a71 6
@@@@ -3780,7 +3780,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");
d73 1
d75 25
a99 36
     if((which & FE_FOLLOWUPTO) && e->followup_to)
@@@@ -4404,7 +4404,7 @@@@
     }
 
     if(!sparms->bar.title)
-      sparms->bar.title = "Text";
+      sparms->bar.title = "r";
 
     if(sparms->bar.style == TitleBarNone)
       sparms->bar.style = MsgTextPercent;
@@@@ -4553,7 +4553,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 */
@@@@ -4669,7 +4669,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;
             }
 
@@@@ -4708,12 +4708,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));
 		}
a100 95
 	    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;
 
@@@@ -4727,12 +4727,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;
@@@@ -4749,11 +4749,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));
 	    }
 
@@@@ -4770,11 +4770,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));
 	    }
 
@@@@ -4805,7 +4805,7 @@@@
 		}
 
 		q_status_message(SM_ORDER, 0, 1,
-				 "Already on last selectable item");
+				 "wgb̫@@ӥiܪؤW");
 	    }
 
 	    break;
@@@@ -4835,7 +4835,7 @@@@
 		}
 
 		q_status_message(SM_ORDER, 0, 1,
-				 "Already on first selectable item");
+				 "wgbĤ@@ӥiܪؤW");
 	    }
 
 	    break;
@@@@ -4941,14 +4941,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");
             else
-	      q_status_message(SM_ORDER | SM_DING, 0, 3, "Word not found");
+	      q_status_message(SM_ORDER | SM_DING, 0, 3, "䤣Ӧr");
 
             break; 
 
@@@@ -6065,10 +6065,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");
a101 11
 	else{
 	    SCROLL_S sargs;
@@@@ -6079,7 +6079,7 @@@@
 	    memset(&sargs, 0, sizeof(SCROLL_S));
 	    sargs.text.text  = f;
 	    sargs.text.src   = FileStar;
-	    sargs.text.desc  = "help text";
+	    sargs.text.desc  = "Ur";
 	    sargs.bar.title  = title;
 	    sargs.bar.style  = TextPercent;
 	    sargs.help.text  = h_simple_text_view;
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@d1 14
a14 22
--- pico/pico.c.orig	Sat Jan 17 20:21:35 1998
+++ pico/pico.c	Sat Jan 17 20:23:21 1998
@@@@ -585,17 +585,17 @@@@
 	}
     }
     else switch(mlyesno(Pmaster->headents
-	 ? "Cancel message (answering \"Yes\" will abandon your mail message)"
+	 ? "\"\"oӰʧ@@N|AثeH.   ?"
 	 : (anycb() == FALSE)
-	     ? "Cancel Edit (and abandon changes)"
-	     : "Cancel Edit",
+	     ? "s(éҦ)"
+	     : "s",
 	 FALSE)){
       case TRUE:
 	pico_all_done = COMP_CANCEL;
 	return(TRUE);
 
       case ABORT:
-	emlwrite("\007Cancel Cancelled", NULL);
+	emlwrite("\007", NULL);
 	break;
d16 462
a477 1
       default:
@
