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


1.6
date	2000.11.17.19.06.52;	author keith;	state dead;
branches;
next	1.5;

1.5
date	99.11.01.00.40.56;	author steve;	state Exp;
branches;
next	1.4;

1.4
date	98.08.09.00.51.25;	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.29;	author vanilla;	state Exp;
branches;
next	;


desc
@@


1.6
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
@--- pico/pico.c.orig	Fri Jun 11 06:56:16 1999
+++ pico/pico.c	Thu Oct 14 10:53:41 1999
@@@@ -313,7 +313,7 @@@@
 	c = GetKey();
         if (term.t_nrow < 6 && c != NODATA){
             (*term.t_beep)();
-            emlwrite("Please make the screen bigger.", NULL);
+            emlwrite("бNeդj@@ǡC", NULL);
             continue;
         }
 
@@@@ -555,9 +555,9 @@@@
     }
     
     if(c&CTRL)
-      emlwrite("\007Unknown Command: ^%c", (void *)(c&0xff));
+      emlwrite("\007ROG^%c", (void *)(c&0xff));
     else
-      emlwrite("\007Unknown Command", NULL);
+      emlwrite("\007RO", NULL);
 
     lastflag = 0;                           /* Fake last flags.     */
     return (FALSE);
@@@@ -610,7 +610,7 @@@@
 	    return(TRUE);
 	}
 	else{
-	    emlwrite("Cancel Cancelled", NULL);
+	    emlwrite("", NULL);
 	    curwp->w_flag |= WFMODE;		/* and modeline so we  */
 	    sgarbk = TRUE;			/* redraw the keymenu  */
 	    pclear(term.t_nrow - 1, term.t_nrow + 1);
@@@@ -619,17 +619,17 @@@@
 	}
     }
     else switch(mlyesno(Pmaster->headents
-	 ? "Cancel message (answering \"Yes\" will abandon your mail message)"
+	 ? "\"\"oӰʧ@@N|AثeHCTw"
 	 : (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;
 
       default:
@@@@ -667,7 +667,7 @@@@
 
 	/* First, make sure there are no outstanding problems */ 
 	if(AttachError()){
-	    emlwrite("\007Problem with attachments!  Fix errors or delete attachments.", NULL);
+	    emlwrite("\007D! Э״_ΧRӪC", NULL);
 	    return(FALSE);
 	}
 
@@@@ -701,7 +701,7 @@@@
         if (f != FALSE                          /* Argument forces it.  */
         || anycb() == FALSE                     /* All buffers clean.   */
 						/* User says it's OK.   */
-        || (s=mlyesno("Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES)", -1)) == FALSE) {
+        || (s=mlyesno("sJLwİ (^ \"No\" NMҦwLק)", -1)) == FALSE) {
                 vttidy();
 #if     defined(USE_TERMCAP) || defined(USE_TERMINFO) || defined(VMS)
 		kbdestroy(kbesc);
@@@@ -714,7 +714,7 @@@@
 	      wquit(1, 0);
 	}
 	else if(s == ABORT){
-	    emlwrite("Exit cancelled", NULL);
+	    emlwrite("}", NULL);
 	    if(term.t_mrow == 0)
 	      curwp->w_flag |= WFHARD;	/* cause bottom 3 lines to paint */
 	}
@@@@ -748,7 +748,7 @@@@
 ctrlg(f, n)
 int f, n;
 {
-    emlwrite("Cancelled", NULL);
+    emlwrite("", NULL);
     return (ABORT);
 }
 
@@@@ -759,7 +759,7 @@@@
 rdonly()
 {
     (*term.t_beep)();
-    emlwrite("Key illegal in VIEW mode", NULL);
+    emlwrite("oO@@Ӧb VIEW ҦXkRO", NULL);
     return(FALSE);
 }
 
@@@@ -1323,7 +1323,7 @@@@
        wp->doto = 0;
    }
    else
-     emlwrite("Can't allocate space for text", NULL);
+     emlwrite("LktmrOŶ", NULL);
 
    return((void *)wp);
 }
@@@@ -1411,7 +1411,7 @@@@
 	    register LINE *lp;
 
 	    if((lp = lalloc(0)) == NULL){
-		emlwrite("Can't allocate space for more characters",NULL);
+		emlwrite("LktmOŶhr",NULL);
 		return(0);
 	    }
 
@


1.5
log
@Update to version 4.20.

PR:		14575
Submitted by:	maintainer
@
text
@@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pico/pico.c.orig	Tue Jul  7 05:41:45 1998
+++ pico/pico.c	Tue Aug  4 12:42:15 1998
@@@@ -318,7 +318,7 @@@@
d12 1
a12 1
@@@@ -560,9 +560,9 @@@@
d24 1
a24 1
@@@@ -615,7 +615,7 @@@@
d33 1
a33 1
@@@@ -624,17 +624,17 @@@@
d55 1
a55 1
@@@@ -672,7 +672,7 @@@@
d64 1
a64 1
@@@@ -706,7 +706,7 @@@@
d73 1
a73 1
@@@@ -719,7 +719,7 @@@@
d82 1
a82 1
@@@@ -753,7 +753,7 @@@@
d91 1
a91 1
@@@@ -764,7 +764,7 @@@@
d100 1
a100 1
@@@@ -1289,7 +1289,7 @@@@
d109 1
a109 1
@@@@ -1377,7 +1377,7 @@@@
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 12
a12 17
--- pico/search.c.orig	Fri Jun 26 05:48:14 1998
+++ pico/search.c	Tue Jul 28 08:35:01 1998
@@@@ -165,7 +165,7 @@@@
 	        break;
 	      default:
 		if(status == ABORT)
-		  emlwrite("Search Cancelled", NULL);
+		  emlwrite("jM", NULL);
 		else
 		  mlerase();
 		curwp->w_flag |= WFMODE;
@@@@ -212,16 +212,16 @@@@
 
     /* and complain if not there */
     if (status == FALSE){
-      emlwrite("\"%s\" not found", defpat);
+      emlwrite("䤣 \"%s\"", defpat);
d14 21
a34 7
     else if((gmode & MDREPLACE) && repl_mode == TRUE){
         status = replace_pat(defpat, &wrapt2);    /* replace pattern */
 	if (wrapt == TRUE || wrapt2 == TRUE)
-	  emlwrite("Replacement %srapped",
-		   (status == ABORT) ? "cancelled but w" : "W");
+	  emlwrite("N%sɮװ_lqYjM",
+		   (status == ABORT) ? "wA" : "");
d36 45
a80 94
     else if(wrapt == TRUE){
-	emlwrite("Search Wrapped", NULL);
+	emlwrite("qYjM", NULL);
     }
     else if(status == TRUE){
 	emlwrite("", NULL);
@@@@ -251,7 +251,7 @@@@
 	/* additional 'replace all' menu option */
         menu_pat[0].name  = "^X";
         menu_pat[0].key   = (CTRL|'X');
-        menu_pat[0].label = "Repl All";
+        menu_pat[0].label = "NҦ";
         KS_OSDATASET(&menu_pat[0], KS_NONE);
 	menu_pat[1].name  = NULL;
 
@@@@ -263,12 +263,12 @@@@
            (*term.t_rev)(0);
 
 	    if (repl_all)
-	      strcpy(prompt, "Replace every \"");
+	      strcpy(prompt, "NC@@ \"");
 	    else
-	      strcpy(prompt, "Replace \"");
+	      strcpy(prompt, "N \"");
 
 	    expandp(&defpat[0], &prompt[strlen(prompt)], NPAT/2);
-	    strcat(prompt, "\" with");
+	    strcat(prompt, "\" ");
 	    if(rpat[0] != 0){
 		strcat(prompt, " [");
 		expandp(rpat, &prompt[strlen(prompt)], NPAT/2);
@@@@ -286,9 +286,9 @@@@
             case HELPCH:                      /* help requested */
                 if(Pmaster)
                   (*Pmaster->helper)(Pmaster->search_help,
-                                     "Help for Searching", 1);
+                                     "jMU", 1);
                 else
-                  pico_help(SearchHelpText, "Help for Searching", 1);
+                  pico_help(SearchHelpText, "jMU", 1);
 
 	    case (CTRL|'L'):			/* redraw requested */
 		refresh(FALSE, 1);
@@@@ -298,10 +298,10 @@@@
 	    case (CTRL|'X'):        /* toggle replace all option */
 	        if (repl_all){
 		  repl_all = FALSE;
-		  menu_pat[0].label = "Repl All";
+		  menu_pat[0].label = "NҦ";
 	        }else{
 		  repl_all = TRUE;
-		  menu_pat[0].label = "Repl One";
+		  menu_pat[0].label = "N@@";
 		}
 	        break;
 
@@@@ -342,7 +342,7 @@@@
 		else
 		{
 		  if(status == ABORT)
-		    emlwrite("Replacement Cancelled", NULL);
+		    emlwrite("N", NULL);
 		  else
 		    mlerase();
 		  chword(defpat, defpat);
@@@@ -352,7 +352,7 @@@@
 
 	    default:
                 if(status == ABORT)
-                  emlwrite("Replacement Cancelled", NULL);
+                  emlwrite("N", NULL);
                 else
                   mlerase();
 		chword(defpat, defpat);
@@@@ -384,9 +384,9 @@@@
 	(*term.t_rev)(0);
 	fflush(stdout);
 
-	strcpy(prompt, "Replace \"");
+	strcpy(prompt, "N \"");
 	expandp(&orig[0], &prompt[strlen(prompt)], NPAT/2);
-	strcat(prompt, "\" with \"");
+	strcat(prompt, "\"  \"");
 	expandp(&repl[0], &prompt[strlen(prompt)], NPAT/2);
 	strcat(prompt, "\"");
 
@@@@ -400,13 +400,13 @@@@
 	    chword(orig, orig);			/* replace word by itself */
 	    update();
 	    if(status == ABORT){		/* if cancelled return */
-		emlwrite("Replace All cancelled after %d changes", (char *) n);
+		emlwrite("buNҦveAwL %d ӧ", (char *) n);
 		return (ABORT);			/* ... else keep looking */
 	    }
d82 26
a107 6
     }
     else{
-	emlwrite("No more matches for \"%s\"", orig);
+	emlwrite("SŦX \"%s\" rF", orig);
 	return (FALSE);
     }
d109 8
a116 2
@@@@ -423,18 +423,18 @@@@
 	EXTRAKEYS    menu_pat[4];
a117 34
 	menu_pat[0].name  = "^Y";
-	menu_pat[0].label = "FirstLine";
+	menu_pat[0].label = "Ĥ@@";
 	menu_pat[0].key   = (CTRL|'Y');
 	KS_OSDATASET(&menu_pat[0], KS_NONE);
 	menu_pat[1].name  = "^V";
-	menu_pat[1].label = "LastLine";
+	menu_pat[1].label = "̫@@";
 	menu_pat[1].key   = (CTRL|'V');
 	KS_OSDATASET(&menu_pat[1], KS_NONE);
 	menu_pat[2].name  = "^R";
 	if (repl_mode)
-	  menu_pat[2].label = "Don't Replace";
+	  menu_pat[2].label = "N";
 	else
-	  menu_pat[2].label = "Replace";
+	  menu_pat[2].label = "N";
 	menu_pat[2].key   = (CTRL|'R');
 	KS_OSDATASET(&menu_pat[2], KS_NONE);
 	menu_pat[3].name  = NULL;
@@@@ -485,11 +485,11 @@@@
 	EXTRAKEYS    menu_pat[3];
 
 	menu_pat[0].name  = "^Y";
-	menu_pat[0].label = "FirstLine";
+	menu_pat[0].label = "Ĥ@@";
 	menu_pat[0].key   = (CTRL|'Y');
 	KS_OSDATASET(&menu_pat[0], KS_NONE);
 	menu_pat[1].name  = "^V";
-	menu_pat[1].label = "LastLine";
+	menu_pat[1].label = "̫@@";
 	menu_pat[1].key   = (CTRL|'V');
 	KS_OSDATASET(&menu_pat[1], KS_NONE);
 	menu_pat[2].name  = NULL;
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 47
a47 295
--- pine/adrbkcmd.c.orig	Tue Jul  7 03:24:34 1998
+++ pine/adrbkcmd.c	Wed Jul 15 17:02:32 1998
@@@@ -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},
+	{"<","a}ï",{MC_EXIT,2,{'<',','}},KS_NONE},
+	{"U","s",{MC_EDIT,1,{'u'}},KS_NONE},
 	NULL_MENU,
-	{"C","ComposeTo",{MC_COMPOSE,1,{'c'}},KS_COMPOSER},
+	{"C","s",{MC_COMPOSE,1,{'c'}},KS_COMPOSER},
 	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","˵s",{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@@s",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
+	{"^F","U@@s",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
 	NULL_MENU,
 	NULL_MENU,
 	NULL_MENU,
@@@@ -144,7 +144,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,
@@@@ -153,7 +153,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
@@@@ -301,15 +301,15 @@@@
 	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;
-	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);
 
@@@@ -405,7 +405,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;
 	    }
@@@@ -433,7 +433,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
@@@@ -478,7 +478,7 @@@@
 			  h_ab_text_or_vcard, RB_NORM);
 	switch(i){
 	  case 'x':
-	    cancel_warning(NO_DING, "forward");
+	    cancel_warning(NO_DING, "H");
 	    break;
 
 	  case 't':
@@@@ -704,8 +704,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);
@@@@ -772,8 +772,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);
@@@@ -796,19 +796,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",
+   verify_nick,   NULL, NULL, addr_book_nick_for_edit, "a}ï",
    1, 0, 0, 0, 0, 1, 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, view_message_for_pico,   "ƧX",
    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, folders_for_fcc,         "ƧX",
    1, 0, 0, 0, 1, 1, 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, view_message_for_pico,   "ƧX",
    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",
+   verify_addr,   NULL, NULL, addr_book_change_list,   "a}ï",
    1, 1, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
   {NULL, NULL, NO_HELP, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL,
    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE}
@@@@ -923,7 +923,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;
@@@@ -938,7 +938,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,
@@@@ -1523,12 +1523,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;
     }
 
@@@@ -1552,8 +1552,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);
     
@@@@ -1576,7 +1576,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));
 }
 
 
@@@@ -1584,7 +1584,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));
 }
 
 
@@@@ -1701,16 +1701,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;
     }
@@@@ -1759,7 +1759,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,
@@@@ -1828,8 +1828,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 : "") &&
@@@@ -1837,8 +1837,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{
 
@@@@ -1898,8 +1898,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;
 	    }
@@@@ -1924,8 +1924,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);
@@@@ -2099,7 +2099,7 @@@@
 
     if(ps_global->readonly_pinerc){
 	if(err)
-	  *err = "Delete cancelled: config file not changeable";
+	  *err = "RG]wɵLkQ";
 	
 	return -1;
     }
@@@@ -2116,10 +2116,10 @@@@
 	if(err){
 	    if(pab->type & GLOBAL)
 	      *err =
-    "Cancelled: Sys. Mgmt. does not allow changing global address book config";
+    "ʧ@@Gtκ޲z\\ܾ骺a}ï]w";
d49 2
a50 23
 	      *err =
-    "Cancelled: Sys. Mgmt. does not allow changing address book config";
+    "ʧ@@Gtκ޲z\\ܦa}ï]w";
 	}
 
 	return -1;
@@@@ -2172,8 +2172,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,
@@@@ -2191,7 +2191,7 @@@@
 		
 	      case 'x':
 		if(err)
-		  *err = "Delete cancelled";
+		  *err = "R";
d52 28
a79 37
 		return -1;
 	    }
@@@@ -2202,7 +2202,7 @@@@
 	      case 'n':
 	      case 'x':
 	        if(err)
-		  *err = "Delete cancelled";
+		  *err = "R";
 
 	        return -1;
 	    
@@@@ -2247,7 +2247,7 @@@@
 	  case 'x':				/* Cancel */
 	  default:
 	    if(err)
-	      *err = "Delete cancelled";
+	      *err = "R";
 
 	    return -1;
 	}
@@@@ -2267,7 +2267,7 @@@@
           case 'x':
 	  default:
 	    if(err)
-	      *err = "Delete cancelled";
+	      *err = "R";
 
 	    return -1;
 	
@@@@ -2328,7 +2328,7 @@@@
 		  case 'n':
 		  default:
 		    if(err)
-		      *err = "Delete cancelled";
+		      *err = "R";
 
 		    return -1;
d81 1
a81 120
@@@@ -2467,7 +2467,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);
@@@@ -2534,7 +2534,7 @@@@
 
     if(ps_global->readonly_pinerc){
 	if(msg)
-	  *msg = cpystr("Shuffle cancelled: config file not changeable");
+	  *msg = cpystr("G]wɵLkQ");
 	
 	return -1;
     }
@@@@ -2544,12 +2544,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';
@@@@ -2557,7 +2557,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;
 	}
@@@@ -2577,7 +2577,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;
 	}
@@@@ -2616,7 +2616,7 @@@@
 
     if(rv == 'x'){
 	if(msg)
-	  *msg = cpystr("Shuffle cancelled");
+	  *msg = cpystr("");
 	
 	return -1;
     }
@@@@ -2659,7 +2659,7 @@@@
     enum {NotSet, Pers, Glob, Empty} type1, type2;
     int          i, j;
     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));
 
@@@@ -2673,7 +2673,7 @@@@
     if(type1 == Empty){
 	if(msg)
 	  *msg =
-	      cpystr("Shuffle cancelled: highlight entry you wish to shuffle");
+	      cpystr("GХХܱ㪺");
 
 	return -1;
     }
@@@@ -2690,14 +2690,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 -1;
     }
 
     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 -1;
     }
@@@@ -3167,7 +3167,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[] = {
@@@@ -3190,7 +3190,7 @@@@
 
     switch(i){
       case 'x':
-	cancel_warning(NO_DING, "export");
+	cancel_warning(NO_DING, "ץX");
 	return(ret);
     
       case 'a':
@@@@ -3219,7 +3219,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 = "";
     }
d83 37
a119 113
     ab_export_opts[++r].ch = -1;
@@@@ -3232,7 +3232,7 @@@@
     if(r < 0){
 	switch(r){
 	  case -1:
-	    cancel_warning(NO_DING, "export");
+	    cancel_warning(NO_DING, "ץX");
 	    break;
 
 	  case -2:
@@@@ -3616,7 +3616,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':
@@@@ -3700,7 +3700,7 @@@@
 
     gf_clear_so_writec((STORE_S *) pb->contents.text.data);
 
-    pine_send(outgoing, &body, "FORWARDING ADDRESS BOOK ENTRY", NULL,
+    pine_send(outgoing, &body, "Ha}ï", NULL,
  	      NULL, NULL, NULL, NULL, 0);
     
     ps->mangled_screen = 1;
@@@@ -4165,8 +4165,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 ? ",
@@@@ -4177,7 +4177,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':
@@@@ -4356,7 +4356,7 @@@@
 		if(action_list)
 		  fs_give((void **)&action_list);
 
-		cancel_warning(NO_DING, "save");
+		cancel_warning(NO_DING, "s");
 		return(ret);
 	    }
 
@@@@ -4545,7 +4545,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){
@@@@ -4621,15 +4621,15 @@@@
 
     if(!agg && as.opened){
 	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;
 
@@@@ -4700,7 +4700,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;
 			
@@@@ -4924,7 +4924,7 @@@@
 		lineno = 0L;
 
 		if(as.opened)
-		  print_text1("      ADDRESS BOOK %s\n\n",
+		  print_text1("      a}ï %s\n\n",
 			      as.adrbks[as.cur].nickname);
 
 
@@@@ -4979,7 +4979,7 @@@@
     dprint(2, (debugfile, "- ab_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;
@@@@ -5144,7 +5144,7 @@@@
a121 33
 	else
-	  cmd_cancelled("Apply command");
+	  cmd_cancelled("MΩRO");
     }
 
     return(ret);
@@@@ -5192,7 +5192,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:
@@@@ -5200,13 +5200,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;
     } 
 
@@@@ -5305,7 +5305,7 @@@@
 	return 0;
d124 3
a126 3
-	q_status_message(SM_INFO, 0, 2, "Entry not deleted");
+	q_status_message(SM_INFO, 0, 2, "ӶإQR");
 	return 0;
d129 2
a130 58
@@@@ -5441,7 +5441,7 @@@@
     if(r == 1 || r != 10 && fbuf[0] == '\0'){
 	ps->mangled_footer = 1;
 	if(error)
-	  *error = cpystr("Cancelled");
+	  *error = cpystr("");
 
 	return(ret);
     }
@@@@ -5480,7 +5480,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,
@@@@ -5728,13 +5728,13 @@@@
 static struct key ldap_view_keys[] =
        {HELP_MENU,
 	NULL_MENU,
-	{"<","Results Index",{MC_EXIT,2,{'<',','}},KS_NONE},
+	{"<","G",{MC_EXIT,2,{'<',','}},KS_NONE},
 	PRYNTTXT_MENU,
 	NULL_MENU,
 	NULL_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};
@@@@ -5763,12 +5763,12 @@@@
 	memset(&sargs, 0, sizeof(SCROLL_S));
 	sargs.text.text	  = so_text(srcstore);
 	sargs.text.src    = srctype;
-	sargs.text.desc   = "expanded entry";
-	sargs.bar.title   = "DIRECTORY ENTRY";
+	sargs.text.desc   = "wi}";
+	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);
 
@@@@ -6117,7 +6117,7 @@@@
     struct headerentry *he;
     void (*redraw_pico)();
 {
-    return("Cancelled");
+    return("");
 }
 
d132 34
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@d1 693
a693 57
*** pico/display.c.bak	Wed Jul 10 20:59:09 1996
--- pico/display.c	Thu Jan 29 23:06:07 1998
***************
*** 82,88 ****
      {"^X", "Exit", KS_EXIT},		{"^J", "Justify", KS_JUSTIFY},
      {"^W", "Where is", KS_WHEREIS},	{"^V", "Next Pg", KS_NEXTPAGE},
      {"^U", NULL, KS_NONE},
! #ifdef	SPELLER
      {"^T", "To Spell", KS_SPELLCHK}
  #else
      {"^D", "Del Char", KS_NONE}
--- 82,88 ----
      {"^X", "Exit", KS_EXIT},		{"^J", "Justify", KS_JUSTIFY},
      {"^W", "Where is", KS_WHEREIS},	{"^V", "Next Pg", KS_NEXTPAGE},
      {"^U", NULL, KS_NONE},
! #if defined(SPELLER) && !defined(__FreeBSD__)
      {"^T", "To Spell", KS_SPELLCHK}
  #else
      {"^D", "Del Char", KS_NONE}
*** pico/ebind.h.bak	Fri Mar 15 10:41:58 1996
--- pico/ebind.h	Thu Jan 29 23:04:30 1998
***************
*** 145,151 ****
  	{CTRL|'O',		filewrite},
  	{CTRL|'P',		backline},
  	{CTRL|'R',		insfile},
! #ifdef	SPELLER
  	{CTRL|'T',		spell},
  #endif	/* SPELLER */
  	{CTRL|'U',		yank},
--- 145,151 ----
  	{CTRL|'O',		filewrite},
  	{CTRL|'P',		backline},
  	{CTRL|'R',		insfile},
! #if defined(SPELLER) && !defined(__FreeBSD__)
  	{CTRL|'T',		spell},
  #endif	/* SPELLER */
  	{CTRL|'U',		yank},
*** pico/main.c.bak	Wed May 29 04:05:27 1996
--- pico/main.c	Thu Jan 29 23:04:30 1998
***************
*** 72,78 ****
      { F9,  (CTRL|'K')},
      { F10, (CTRL|'U')},
      { F11, (CTRL|'C')},
! #ifdef	SPELLER
      { F12, (CTRL|'T')}
  #else
      { F12, (CTRL|'D')}
--- 72,78 ----
      { F9,  (CTRL|'K')},
      { F10, (CTRL|'U')},
      { F11, (CTRL|'C')},
! #if defined(SPELLER) && !defined(__FreeBSD__)
      { F12, (CTRL|'T')}
  #else
      { F12, (CTRL|'D')}
@
