head	1.7;
access;
symbols
	RELEASE_4_2_0:1.6
	RELEASE_4_1_1:1.6
	RELEASE_4_1_0:1.6
	RELEASE_3_5_0:1.6
	RELEASE_4_0_0:1.6
	RELEASE_3_4_0:1.6
	RELEASE_3_3_0:1.5
	RELEASE_3_2_0:1.5
	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.7
date	2000.11.17.19.06.53;	author keith;	state dead;
branches;
next	1.6;

1.6
date	99.11.01.00.40.57;	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.39;	author vanilla;	state Exp;
branches;
next	1.1;

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


desc
@@


1.7
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/init.c.orig	Sat Oct  2 07:54:14 1999
+++ pine/init.c	Thu Oct 14 13:35:02 1999
@@@@ -339,7 +339,7 @@@@
 
 /*----------------------------------------------------------------------
 These are the variables that control a number of pine functions.  They
-come out of the .pinerc and the /usr/local/lib/pine.conf files.  Some can
+come out of the .pinerc and the @@@@PREFIX@@@@/etc/pine.conf files.  Some can
 be set by the user while in Pine.  Eventually all the local ones should
 be so and maybe the global ones too.
 
@@@@ -660,6 +660,9 @@@@
     GLO_NORM_FORE_COLOR		= cpystr(colorx(DEFAULT_NORM_FORE));
     GLO_NORM_BACK_COLOR		= cpystr(colorx(DEFAULT_NORM_BACK));
 #endif
+
+    F_TURN_ON(F_TCAP_WINS,ps);
+    F_TURN_ON(F_QUELL_INTERNAL_MSG,ps);
 
     /* Set the default mail directory */
     build_path(buf, GLO_MAIL_DIRECTORY, "[]");
@


1.6
log
@Update to version 4.20.

PR:		14575
Submitted by:	maintainer
@
text
@@


1.5
log
@Update to version 4.05.

PR:		8025
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/init.c.orig	Thu Sep  3 01:39:42 1998
+++ pine/init.c	Tue Sep 22 13:50:07 1998
@@@@ -319,7 +319,7 @@@@
d12 3
a14 3
@@@@ -578,6 +578,9 @@@@
 #ifdef	DF_SMTP_SERVER
     GLO_SMTP_SERVER		= parse_list(DF_SMTP_SERVER, 1, NULL);
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 13
a13 3
--- pine/init.c.orig	Fri Jul 17 02:22:22 1998
+++ pine/init.c	Tue Aug  4 12:42:17 1998
@@@@ -579,6 +579,9 @@@@
d16 1
a16 1
 
d19 1
a19 1
+
a21 1
     GLO_FOLDER_SPEC		= parse_list(buf, 1, NULL);
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 12
a12 318
--- pine/mailindx.c.orig	Tue Jul 21 01:21:48 1998
+++ pine/mailindx.c	Tue Jul 28 08:35:03 1998
@@@@ -55,10 +55,10 @@@@
 /*
  * Some common Command Bindings
  */
-#define	VIEWMSG_MENU	{">", "[ViewMsg]", \
+#define	VIEWMSG_MENU	{">", "[˵H]", \
 			 {MC_VIEW_TEXT, 5,{'v','.','>',ctrl('M'),ctrl('J')}}, \
 			 KS_VIEW}
-#define	FLDRSORT_MENU	{"$", "SortIndex", {MC_SORT,1,{'$'}}, KS_SORT}
+#define	FLDRSORT_MENU	{"$", "Ƨǯ", {MC_SORT,1,{'$'}}, KS_SORT}
 
 
 /*
@@@@ -67,7 +67,7 @@@@
 static struct key index_keys[] = 
        {HELP_MENU,
 	OTHER_MENU,
-	{"<", "FldrList", {MC_FOLDERS,2,{'<',','}}, KS_NONE},
+	{"<", "HXC", {MC_FOLDERS,2,{'<',','}}, KS_NONE},
 	VIEWMSG_MENU,
 	PREVMSG_MENU,
 	NEXTMSG_MENU,
@@@@ -94,9 +94,9 @@@@
 	HELP_MENU,
 	OTHER_MENU,
 	{"X",NULL,{MC_EXPUNGE,1,{'x'}},KS_NONE},
-	{"&","unXclude",{MC_UNEXCLUDE,1,{'&'}},KS_NONE},
-	{";","Select",{MC_SELECT,1,{';'}},KS_SELECT},
-	{"A","Apply",{MC_APPLY,1,{'a'}},KS_APPLY},
+	{"&","ư(exclude)",{MC_UNEXCLUDE,1,{'&'}},KS_NONE},
+	{";","",{MC_SELECT,1,{';'}},KS_SELECT},
+	{"A","M",{MC_APPLY,1,{'a'}},KS_APPLY},
 	FLDRSORT_MENU,
 	JUMP_MENU,
 	HDRMODE_MENU,
@@@@ -106,8 +106,8 @@@@
 
 	HELP_MENU,
 	OTHER_MENU,
-	{":","SelectCur",{MC_SELCUR,1,{':'}},KS_SELECTCUR},
-	{"Z","ZoomMode",{MC_ZOOM,1,{'z'}},KS_NONE},
+	{":","",{MC_SELCUR,1,{':'}},KS_SELECTCUR},
+	{"Z","YҦ",{MC_ZOOM,1,{'z'}},KS_NONE},
 	LISTFLD_MENU,
 	NULL_MENU,
 	NULL_MENU,
@@@@ -175,9 +175,9 @@@@
   
 static struct key simple_index_keys[] = 
        {HELP_MENU,
-	{"E","ExitSelect",{MC_EXIT,1,{'e'}},KS_EXITMODE},
+	{"E","}",{MC_EXIT,1,{'e'}},KS_EXITMODE},
 	NULL_MENU,
-	{"S","[Select]",{MC_SELECT,3,{'s',ctrl('M'),ctrl('J')}},KS_SELECT},
+	{"S","[]",{MC_SELECT,3,{'s',ctrl('M'),ctrl('J')}},KS_SELECT},
 	PREVMSG_MENU,
 	NEXTMSG_MENU,
 	PREVPAGE_MENU,
@@@@ -344,14 +344,14 @@@@
     if(flags & INDX_HEADER)
       set_titlebar((stream == ps_global->mail_stream)
 		     ? (style == MsgIndex || style == MultiMsgIndex)
-		         ? "MESSAGE INDEX"
-			 : "ZOOMED MESSAGE INDEX"
+		         ? "H"
+			 : "Y᪺H"
 		     : (!strcmp(folder, INTERRUPTED_MAIL))
-			 ? "COMPOSE: SELECT INTERRUPTED"
+			 ? "sGܳQ_"
 			 : (ps_global->VAR_FORM_FOLDER
 			    && !strcmp(ps_global->VAR_FORM_FOLDER, folder))
-			     ? "COMPOSE: SELECT FORM LETTER"
-			     : "COMPOSE: SELECT POSTPONED",
+			     ? "sGܼ˪H"
+			     : "sGܳQȽw",
 		   stream, cntxt, folder, msgmap, 1, MessageNumber, 0, 0);
 
     if(flags & INDX_FOOTER) {
@@@@ -443,7 +443,7 @@@@
 {
     dprint(1, (debugfile, "\n\n ---- MAIL INDEX ----\n"));
     if(!state->mail_stream) {
-	q_status_message(SM_ORDER, 0, 3, "No folder is currently open");
+	q_status_message(SM_ORDER, 0, 3, "ثe|Lw}ҪHX");
         state->prev_screen = mail_index_screen;
 	state->next_screen = main_menu_screen;
 	return;
@@@@ -624,7 +624,7 @@@@
 	if(F_ON(F_SHOW_CURSOR, state) && cur_row < 0){
 	    q_status_message(SM_ORDER,
 		(ch==NO_OP_IDLE || ch==NO_OP_COMMAND) ? 0 : 3, 5,
-		"No messages in folder");
+		"HXSH");
 	    cur_row = state->ttyo->screen_rows - FOOTER_ROWS(state);
 	    display_message(ch);
 	}
@@@@ -741,7 +741,7 @@@@
 		    k = i;
 		    if(++j >= id.lines_per_page){
 			if((id.msg_at_top = i) == 1L)
-			  q_status_message(SM_ORDER, 0, 1, "First Index page");
+			  q_status_message(SM_ORDER, 0, 1, "޲Ĥ@@");
 
 			break;
 		    }
@@@@ -750,7 +750,7 @@@@
 		if(i <= 1L){
 		    if(mn_get_cur(msgmap) == 1L)
 		      q_status_message(SM_ORDER, 0, 1,
-			  "Already at start of Index");
+			  "wgbު_YF");
 
 		    break;
 		}
@@@@ -770,7 +770,7 @@@@
 		    k = i;
 		    if(++j >= id.lines_per_page){
 			if(i+id.lines_per_page >= mn_get_total(msgmap))
-			  q_status_message(SM_ORDER, 0, 1, "Last Index page");
+			  q_status_message(SM_ORDER, 0, 1, "޳̲׭");
 
 			id.msg_at_top = i;
 			break;
@@@@ -779,7 +779,7 @@@@
 
 		if(i >= mn_get_total(msgmap)){
 		    if(mn_get_cur(msgmap) == k)
-		      q_status_message(SM_ORDER,0,1,"Already at end of Index");
+		      q_status_message(SM_ORDER,0,1,"wgbުF");
 
 		    break;
 		}
@@@@ -961,9 +961,9 @@@@
 			}
 
 			q_status_message2(SM_ORDER, 0, 1,
-					  "Message %s %sdeleted",
+					  "H %s %sR",
 					  long2string(mn_get_cur(msgmap)),
-					  (del) ? "" : "already ");
+					  (del) ? "" : "w");
 		    }
 
 		    break;
@@@@ -985,9 +985,9 @@@@
 			}
 
 			q_status_message2(SM_ORDER, 0, 1,
-					  "Message %s %sdeleted",
+					  "H %s %sR",
 					  long2string(mn_get_cur(msgmap)),
-					  (del) ? "UN" : "NOT ");
+					  (del) ? "wD_" : "Q");
 		    }
 
 		    break;
@@@@ -1787,7 +1787,7 @@@@
 	    dprint(1, (debugfile,
 		       "parse_index_format: unrecognized token: %s\n", q));
 	    q_status_message1(SM_ORDER | SM_DING, 0, 3,
-			      "Unrecognized string in index-format: %s", q);
+			      "ޮ榡X{LkѪrG%s", q);
 	    continue;
 	}
 
@@@@ -1829,7 +1829,7 @@@@
     if(!column){
 	dprint(1, (debugfile, "Completely unrecognizable index-format\n"));
 	q_status_message(SM_ORDER | SM_DING, 0, 3,
-		 "Configured \"index-format\" unrecognizable. Using default.");
+		 "LkѤw]w \"index-format\"Cϥιw]ȡC");
 	return(0);
     }
 
@@@@ -2320,7 +2320,7 @@@@
 		    sprintf(str, "%ld", idata->msgno);
 		  else if(idata->bogus < 2 && cdesc->ctype == iSubject)
 		    sprintf(str, "%-*.*s", width, width,
-			    "[ No Message Text Available ]");
+			    "[ LkoH ]");
 	      }
 	      else
 		switch(cdesc->ctype){
@@@@ -2959,8 +2959,8 @@@@
     HelpType	help;
     static char search_string[MAX_SEARCH+1] = { '\0' };
     static ESCKEY_S header_search_key[] = { {0, 0, NULL, NULL },
-					    {ctrl('Y'), 10, "^Y", "First Msg"},
-					    {ctrl('V'), 11, "^V", "Last Msg"},
+					    {ctrl('Y'), 10, "^Y", "Ĥ@@ʫH"},
+					    {ctrl('V'), 11, "^V", "̫@@ʫH"},
 					    {-1, 0, NULL, NULL} };
 
     dprint(4, (debugfile, "\n - search headers - \n"));
@@@@ -2969,7 +2969,7 @@@@
 	return;
     }
     else if(mn_total_cur(msgmap) > 1L){
-	q_status_message1(SM_ORDER, 0, 2, "%s msgs selected; Can't search",
+	q_status_message1(SM_ORDER, 0, 2, "w %s ʫHFLkjM",
 			  comatose(mn_total_cur(msgmap)));
 	return;
     }
@@@@ -2980,13 +2980,13 @@@@
     new_string[0] = '\0';
 
     while(1) {
-	sprintf(prompt, "Word to search for [%s] : ", search_string);
+	sprintf(prompt, "jM[%s]G", search_string);
 
 	if(F_ON(F_ENABLE_AGG_OPS, ps_global)){
 	    header_search_key[0].ch    = ctrl('X');
 	    header_search_key[0].rval  = 12;
 	    header_search_key[0].name  = "^X";
-	    header_search_key[0].label = "Select Matches";
+	    header_search_key[0].label = "ŦX";
 	}
 	else{
 	    header_search_key[0].ch   = header_search_key[0].rval  = 0;
@@@@ -3005,7 +3005,7 @@@@
             continue;
         }
 	else if(rc == 10){
-	    q_status_message(SM_ORDER, 0, 3, "Searched to First Message.");
+	    q_status_message(SM_ORDER, 0, 3, "jMܲĤ@@ʫHC");
 	    if(any_lflagged(msgmap, MN_HIDE)){
 		do{
 		    selected = sorted_msg;
@@@@ -3021,7 +3021,7 @@@@
 	    return;
 	}
 	else if(rc == 11){
-	    q_status_message(SM_ORDER, 0, 3, "Searched to Last Message.");
+	    q_status_message(SM_ORDER, 0, 3, "jM̫ܳ@@ʫHC");
 	    if(any_lflagged(msgmap, MN_HIDE)){
 		do{
 		    selected = sorted_msg;
@@@@ -3046,7 +3046,7 @@@@
     }
 
     if(rc == 1 || (new_string[0] == '\0' && search_string[0] == '\0')) {
-	cmd_cancelled("Search");
+	cmd_cancelled("jM");
         return;
     }
 
@@@@ -3085,21 +3085,21 @@@@
 	}
 
     if(ps_global->intr_pending){
-	q_status_message1(SM_ORDER, 0, 3, "Search cancelled.%s",
+	q_status_message1(SM_ORDER, 0, 3, "jMC%s",
 			  select_all ? " Selected set may be incomplete.":"");
     }
     else if(select_all){
-	q_status_message1(SM_ORDER, 0, 3, "%s messages found matching word",
+	q_status_message1(SM_ORDER, 0, 3, "@@ %s ʫHŦXr",
 			  long2string(selected));
     }
     else if(selected){
-	q_status_message1(SM_ORDER, 0, 3, "Word found%s",
+	q_status_message1(SM_ORDER, 0, 3, "rw%s",
 			  (i <= sorted_msg)
-			    ? ". Search wrapped to beginning" : "");
+			    ? "CYjM" : "");
 	mn_set_cur(msgmap, i);
     }
     else
-      q_status_message(SM_ORDER, 0, 3, "Word not found");
+      q_status_message(SM_ORDER, 0, 3, "䤣r");
 
 #ifndef	DOS
     intr_handling_off();
@@@@ -3236,7 +3236,7 @@@@
 		 && LEVELSORT(ps_global->mail_stream)))
 	      sort_func = percent_sorted;
 
-	    sprintf(sort_msg, "Sorting \"%s\"",
+	    sprintf(sort_msg, "bƧ \"%s\"",
 		    strsquish(tmp_20k_buf + 500, ps_global->cur_folder,
 			      ps_global->ttyo->screen_cols - 20));
 	    we_cancel = busy_alarm(1, sort_msg, sort_func, 1);
@@@@ -3286,8 +3286,8 @@@@
 		new_sort = mn_get_sort(msgmap);
 		new_rev  = mn_get_revsort(msgmap);
 		q_status_message2(SM_ORDER, 3, 3,
-				  "Sort %s!  Restored %s sort.",
-				  g_sort_prog->abort ? "Canceled" : "Failed",
+				  "Ƨ%sI^_ %s ƧǡC",
+				  g_sort_prog->abort ? "w" : "",
 				  sort_name(new_sort));
 	    }
 	    else if(mn_get_total(msgmap) < g_sort_prog->nmsgs)
@@@@ -4045,7 +4045,7 @@@@
 	      icache.name = temp_nam(NULL, "pi");
 
 	    if((icache.cache = (void *)fopen(icache.name,"w+b")) == NULL){
-		sprintf(tmp_20k_buf, "Can't open index cache: %s",icache.name);
+		sprintf(tmp_20k_buf, "Lk}үާ֨G%s",icache.name);
 		fatal(tmp_20k_buf);
 	    }
 
@@@@ -4398,10 +4398,10 @@@@
 	   && format_message(mn_m2raw(ps_global->msgmap,
 				      mn_get_cur(ps_global->msgmap)),
 			     env, body, FM_NEW_MESS, pc)){
-	    sprintf(title, "Folder %s  --  Message %ld of %ld",
+	    sprintf(title, "HX %s  --  %ld ʫH󤤪 %ld ",
 		    strsquish(tmp_20k_buf + 500, ps_global->cur_folder, 50),
-		    mn_get_cur(ps_global->msgmap),
-		    mn_get_total(ps_global->msgmap));
+		    mn_get_total(ps_global->msgmap),
+		    mn_get_cur(ps_global->msgmap));
 	    *text  = so_text(so);
 	    *l     = strlen((char *)so_text(so));
 	    *style = GETTEXT_TEXT;
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 18
a18 3
--- pine/pine.c.orig	Thu Jul  9 03:22:35 1998
+++ pine/pine.c	Wed Jul 15 17:02:36 1998
@@@@ -107,12 +107,12 @@@@
d20 27
d49 6
a54 11
-	{"P","PrevCmd",{MC_PREVITEM,3,{'p',ctrl('P'),KEY_UP}},KS_NONE},
-	{"N","NextCmd",{MC_NEXTITEM,3,{'n',ctrl('N'),KEY_DOWN}},KS_NONE},
+	{"P","e@@RO",{MC_PREVITEM,3,{'p',ctrl('P'),KEY_UP}},KS_NONE},
+	{"N","@@RO",{MC_NEXTITEM,3,{'n',ctrl('N'),KEY_DOWN}},KS_NONE},
 	NULL_MENU,
 	NULL_MENU,
-	{"R","RelNotes",{MC_RELNOTES,1,{'r'}},KS_NONE},
-	{"K","KBLock",{MC_KBLOCK,1,{'k'}},KS_NONE},
+	{"R","X",{MC_RELNOTES,1,{'r'}},KS_NONE},
+	{"K","Lw",{MC_KBLOCK,1,{'k'}},KS_NONE},
 	NULL_MENU,
d56 49
d106 1
a106 78
@@@@ -122,10 +122,10 @@@@
 	COMPOSE_MENU,
 	LISTFLD_MENU,
 	GOTO_MENU,
-	{"I","Index",{MC_INDEX,1,{'i'}},KS_FLDRINDEX},
-	{"J","Journal",{MC_JOURNAL,1,{'j'}},KS_REVIEW},
-	{"S","Setup",{MC_SETUP,1,{'s'}},KS_NONE},
-	{"A","AddrBook",{MC_ADDRBOOK,1,{'a'}},KS_ADDRBOOK},
+	{"I","",{MC_INDEX,1,{'i'}},KS_FLDRINDEX},
+	{"J","x",{MC_JOURNAL,1,{'j'}},KS_REVIEW},
+	{"S","]w",{MC_SETUP,1,{'s'}},KS_NONE},
+	{"A","a}ï",{MC_ADDRBOOK,1,{'a'}},KS_ADDRBOOK},
 	NULL_MENU,
 	NULL_MENU};
 INST_KEY_MENU(main_keymenu, main_keys);
@@@@ -518,7 +518,7 @@@@
 		static struct key simple_file_keys[] =
 		{HELP_MENU,
 		 NULL_MENU,
-		 {"Q","Quit Viewer",{MC_EXIT,1,{'q'}},KS_NONE},
+		 {"Q","}",{MC_EXIT,1,{'q'}},KS_NONE},
 		 NULL_MENU,
 		 NULL_MENU,
 		 NULL_MENU,
@@@@ -527,15 +527,15 @@@@
 		 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_file_keymenu, simple_file_keys);
 #define SAVE_KEY 9
 
 		memset(&sargs, 0, sizeof(SCROLL_S));
 		sargs.text.text = so_text(store);
 		sargs.text.src  = src;
-		sargs.text.desc = "file";
-		sargs.bar.title = "FILE VIEW";
+		sargs.text.desc = "ɮ";
+		sargs.bar.title = "˵ɮ";
 		sargs.bar.style = FileTextPercent;
 		sargs.keys.menu = &simple_file_keymenu;
 		setbitmap(sargs.keys.bitmap);
@@@@ -716,7 +716,7 @@@@
 	    if(!pine_state->VAR_INBOX_PATH || !pine_state->VAR_INBOX_PATH[0]
 	       || strucmp(pine_state->VAR_INBOX_PATH, "inbox") == 0){
 		HelpType help = NO_HELP;
-		static   ESCKEY_S ekey[] = {{ctrl(T), 2, "^T", "To Fldrs"},
+		static   ESCKEY_S ekey[] = {{ctrl(T), 2, "^T", "ƧX"},
 					  {-1, 0, NULL, NULL}};
 
 		pine_state->mangled_footer = 1;
@@@@ -726,7 +726,7 @@@@
 
         	    rv = optionally_enter(int_mail, -FOOTER_ROWS(pine_state),
 				      0, MAXPATH,
-				      "No inbox!  Folder to open as inbox : ",
+				      "SsiHX(inbox)IHX}Ҭ inboxG",
 				      /* ekey */ NULL, help, &flags);
         	    if(rv == 3){
 			help = (help == NO_HELP) ? h_sticky_inbox : NO_HELP;
@@@@ -738,7 +738,7 @@@@
     		}
 
     		if(rv == 1){
-		    q_status_message(SM_ORDER, 0, 2 ,"Folder open cancelled");
+		    q_status_message(SM_ORDER, 0, 2 ,"}ҫHX");
 		    rv = 0;		/* reset rv */
 		} 
 		else if(rv == 2){
@@@@ -757,7 +757,7 @@@@
 		    removing_leading_white_space(int_mail);
 		    if((!pine_state->VAR_INBOX_PATH 
 			|| strucmp(pine_state->VAR_INBOX_PATH, "inbox") == 0)
-		     && want_to("Preserve folder as \"inbox-path\" in PINERC", 
+		     && want_to("b PINERC OdƧX \"inbox-path\"", 
 				'y', 'n', NO_HELP, WT_NORM) == 'y'){
 			set_variable(V_INBOX_PATH, int_mail, 1);
d108 24
a131 33
@@@@ -902,25 +902,25 @@@@
 		 *news_addition;
     int		  key_index;	  /* index into keymenu array for this cmd */
 } mkeys[] = {
-    {" %s     HELP               -  Get help using Pine",
+    {" %s     ϥλ           -  Pine ϥλ",
      NULL, MAIN_HELP_KEY},
     {"", NULL, UNUSED},
-    {" %s     COMPOSE MESSAGE    -  Compose and send%s a message",
+    {" %s     gH               -  gHάOo峹",
      "/post", MAIN_COMPOSE_KEY},
     {"", NULL, UNUSED},
-    {" %s     MESSAGE INDEX      -  View messages in current folder",
+    {" %s     dݫHX         -  dݥثeHXH",
      NULL, MAIN_INDEX_KEY},
     {"", NULL, UNUSED},
-    {" %s     FOLDER LIST        -  Select a folder%s to view",
-     " OR news group", MAIN_FOLDER_KEY},
+    {" %s     HXC         -  CXHX%sHѿ",
+     "άOsDոs", MAIN_FOLDER_KEY},
     {"", NULL, UNUSED},
-    {" %s     ADDRESS BOOK       -  Update address book",
+    {" %s     a}ï             -  sέקa}ïe",
      NULL, MAIN_ADDRESS_KEY},
     {"", NULL, UNUSED},
-    {" %s     SETUP              -  Configure Pine Options",
+    {" %s     ]w               -  ]w Pine Ѽ",
      NULL, MAIN_SETUP_KEY},
     {"", NULL, UNUSED},
-    {" %s     QUIT               -  Leave the Pine program",
+    {" %s     }               -   Pine ϥ",
      NULL, MAIN_QUIT_KEY}
 };
d133 12
a144 8
@@@@ -1213,7 +1213,7 @@@@
 		pine_state->mangled_footer = 1;
 	    }
 	    else{
-		helper(main_menu_tx, "HELP FOR MAIN MENU", 0);
+		helper(main_menu_tx, "D檺U", 0);
 		pine_state->mangled_screen = 1;
 	    }
d146 11
a156 6
@@@@ -1241,7 +1241,7 @@@@
 		just_a_navigate_cmd++;
 	    }
 	    else
-	      q_status_message(SM_ORDER, 0, 2, "Already at top of list");
+	      q_status_message(SM_ORDER, 0, 2, "wgbCݤF");
d158 18
a175 1
 	    break;
d177 28
a204 25
@@@@ -1257,14 +1257,14 @@@@
 		just_a_navigate_cmd++;
 	    }
 	    else
-	      q_status_message(SM_ORDER, 0, 2, "Already at bottom of list");
+	      q_status_message(SM_ORDER, 0, 2, "wgbCݤF");
 
 	    break;
 
 
 	    /*---------- Release Notes ----------*/
 	  case MC_RELNOTES :
-	    helper(h_news, "PINE RELEASE NOTES", 0);
+	    helper(h_news, "PINE XKn", 0);
 	    pine_state->mangled_screen = 1;
 	    break;
 
@@@@ -1493,7 +1493,7 @@@@
 
     /* paint the titlebar if needed */
     if(ps->mangled_header){
-	set_titlebar("MAIN MENU", ps->mail_stream, ps->context_current,
+	set_titlebar("D", ps->mail_stream, ps->context_current,
 		     ps->cur_folder, ps->msgmap, 1, FolderName, 0, 0);
 	ps->mangled_header = 0;
d206 35
a240 22
@@@@ -1658,13 +1658,13 @@@@
 {
     char        prompt[80];
     char        letters[20];
-    char        *printer  = "Printer";
-    char        *passwd   = "Newpassword";
-    char        *config   = "Config";
-    char        *update   = "Update";
-    char	*sigedit  = "Signature";
-    char	*abooks   = "AddressBooks";
-    char	*clctns   = "collectionList";
+    char        *printer  = "L";
+    char        *passwd   = "]wsKX";
+    char        *config   = "ҳ]w";
+    char        *update   = "s";
+    char	*sigedit  = "sñW";
+    char	*abooks   = "a}ï";
+    char	*clctns   = "`C";
 #ifdef	ENABLE_LDAP
     char	*dir      = "Directory";
 #endif
@@@@ -1742,13 +1742,13 @@@@
d243 4
a246 12
     sprintf(prompt,
-	    "Choose a setup task from %s : ",
-	    F_ON(F_BLANK_KEYMENU,ps_global) ? letters : "the menu below");
+	    "бq%sܧAҭn]wu@@G",
+	    F_ON(F_BLANK_KEYMENU,ps_global) ? letters : "UC椤");
 
     s = radio_buttons(prompt, ql, setup_names, deefault, 'x', help, RB_NORM);
     /* ^C */
     if(s == 'x') {
-	q_status_message(SM_ORDER,0,3,"Setup command cancelled");
+	q_status_message(SM_ORDER,0,3,"]wO");
 	s = 'e';
d249 2
a250 50
@@@@ -1861,14 +1861,14 @@@@
     HELP_MENU,
     NULL_MENU,
     {"E",NULL,{MC_EXIT,1,{'e',ctrl('M'),ctrl('J')}},KS_NONE},
-    {"Ret","[GetDocument]",{MC_VIEW_HANDLE,2,{ctrl('M'),ctrl('J')}},KS_NONE},
+    {"Ret","[o]",{MC_VIEW_HANDLE,2,{ctrl('M'),ctrl('J')}},KS_NONE},
     NULL_MENU,
     NULL_MENU,
     PREVPAGE_MENU,
     NEXTPAGE_MENU,
     PRYNTMSG_MENU,
     NULL_MENU,
-    {"R","RelNotes",{MC_RELNOTES,1,{'r'}},KS_NONE},
+    {"R","X",{MC_RELNOTES,1,{'r'}},KS_NONE},
     NULL_MENU};
 INST_KEY_MENU(nuov_keymenu, nuov_keys);
 #define	NUOV_EXIT	2
@@@@ -1957,13 +1957,13 @@@@
 		memset(&sargs, 0, sizeof(SCROLL_S));
 		sargs.text.text	   = so_text(store);
 		sargs.text.src	   = CharStar;
-		sargs.text.desc	   = "greeting text";
+		sargs.text.desc	   = "ݭԤr";
 		sargs.text.handles = handles;
-		sargs.bar.title	   = "GREETING TEXT";
+		sargs.bar.title	   = "ݭԤr";
 		sargs.bar.style	   = TextPercent;
 		sargs.proc.tool	   = nuov_processor;
 		sargs.help.text	   = main_menu_tx;
-		sargs.help.title   = "MAIN PINE HELP";
+		sargs.help.title   = "PINE DnU";
 		sargs.resize_exit  = 1;
 		sargs.force_h	   = 1;
 		sargs.keys.menu	   = &km;
@@@@ -1974,11 +1974,11 @@@@
 		setbitmap(sargs.keys.bitmap);
 
 		if(ps->phone_home){
-		    km.keys[NUOV_EXIT].label = "Exit Greeting";
+		    km.keys[NUOV_EXIT].label = "}";
 		    km.keys[NUOV_EXIT].bind.nch = 1;
 		}
 		else{
-		    km.keys[NUOV_EXIT].label	= "[Exit Greeting]";
+		    km.keys[NUOV_EXIT].label	= "[}]";
 		    km.keys[NUOV_EXIT].bind.nch = 3;
 		    clrbitn(NUOV_VIEW, sargs.keys.bitmap);
 		}
@@@@ -2034,7 +2034,7 @@@@
 	break;
d252 17
a268 14
       case MC_RELNOTES :
-	helper(h_news, "PINE RELEASE NOTES", 0);
+	helper(h_news, "PINE XKn", 0);
 	ps_global->mangled_screen = 1;
 	break;
 
@@@@ -2153,7 +2153,7 @@@@
     dprint(1, (debugfile, "\n\n    ---- QUIT SCREEN ----\n"));    
 
     if(!pine_state->nr_mode && F_OFF(F_QUIT_WO_CONFIRM,pine_state)
-       && want_to("Really quit pine", 'y', 0, NO_HELP, WT_NORM) != 'y') {
+       && want_to("un} Pine ܡH", 'y', 0, NO_HELP, WT_NORM) != 'y') {
         pine_state->next_screen = pine_state->prev_screen;
         return;
d270 49
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@d1 134
a134 63
--- pine/folder.c.orig	Wed May 15 09:25:19 1996
+++ pine/folder.c	Sat Jan 17 21:04:13 1998
@@@@ -159,18 +159,18 @@@@
 
 
 static struct key folder_keys[] =
-       {{"?","Help",KS_SCREENHELP},  	{"O","OTHER CMDS",KS_NONE},
+       {{"?","U",KS_SCREENHELP},  	{"O","䥦RO",KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE},
-	{"P","PrevFldr",KS_NONE},	{"N","NextFldr",KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
-	{"D","Delete",KS_NONE},		{"A","Add",KS_NONE},
-	{"R","Rename",KS_NONE},		{"W","WhereIs",KS_NONE},
-
-	{"?","Help",KS_NONE},		{"O","OTHER CMDS",KS_NONE},
-	{"Q","Quit",KS_EXIT},		{"C","Compose",KS_COMPOSER},
-	{NULL,NULL,KS_NONE},		{"G","GotoFldr",KS_GOTOFLDR},
-	{"I","CurIndex",KS_FLDRINDEX},	{"W","WhereIs",KS_WHEREIS},
-	{"Y","prYnt",KS_PRINT},		{NULL,NULL,KS_NONE},
+	{"P","e@@H",KS_NONE},	{"N","@@H",KS_NONE},
+	{"-","W@@",KS_PREVPAGE},	{"Spc","U@@",KS_NEXTPAGE},
+	{"D","R",KS_NONE},		{"A","[J",KS_NONE},
+	{"R","W",KS_NONE},		{"W","jM",KS_NONE},
+
+	{"?","U",KS_NONE},	{"O","䥦RO",KS_NONE},
+	{"Q","}",KS_EXIT},		{"C","gH",KS_COMPOSER},
+	{NULL,NULL,KS_NONE},		{"G","iJH",KS_GOTOFLDR},
+	{"I","ثe",KS_FLDRINDEX},	{"W","jM",KS_WHEREIS},
+	{"Y","CL",KS_PRINT},		{NULL,NULL,KS_NONE},
 	{NULL,NULL,KS_NONE},		{NULL,NULL,KS_NONE}};
 INST_KEY_MENU(folder_keymenu, folder_keys);
 #define	MAIN_KEY  	2  /* Sometimes Main, sometimes Exit */
@@@@ -438,24 +438,24 @@@@
             folder_keys[DELETE_KEY].name = "D";
             folder_keys[ADD_KEY].name = "A";
             folder_keys[RENAME_KEY].name = "R";
-	    folder_keys[RENAME_KEY].label = "Rename";
+	    folder_keys[RENAME_KEY].label = "W";
             if(fs->context->type & FTYPE_BBOARD) {
-                folder_keys[ADD_KEY].label = "Subscribe";
-                folder_keys[DELETE_KEY].label = "UnSbscrbe";
+                folder_keys[ADD_KEY].label = "q\\";
+                folder_keys[DELETE_KEY].label = "q\\";
 		KS_OSDATASET(&folder_keys[DELETE_KEY], KS_NONE);
             } else {
-                folder_keys[ADD_KEY].label = "Add";
-                folder_keys[DELETE_KEY].label = "Delete";
+                folder_keys[ADD_KEY].label = "W[";
+                folder_keys[DELETE_KEY].label = "R";
 		KS_OSDATASET(&folder_keys[DELETE_KEY], KS_NONE);
             }
 	    if(do_what == FolderMaint){
 	      km->how_many = 2;
 	      folder_keys[MAIN_KEY].name = "M";
-	      folder_keys[MAIN_KEY].label = "Main Menu";
+	      folder_keys[MAIN_KEY].label = "D";
 	      KS_OSDATASET(&folder_keys[MAIN_KEY], KS_MAINMENU);
 	      folder_keys[SELECT_KEY].name = "V";
 	      folder_keys[SELECT_KEY].label = 
-		   (fs->context->use & CNTXT_PSEUDO) ? "[Select]":"[ViewFldr]";
+		   (fs->context->use & CNTXT_PSEUDO) ? "[]":"[˵H]";
 	      KS_OSDATASET(&folder_keys[SELECT_KEY], KS_NONE);
 	      clrbitn(WHEREIS_KEY, bitmap); /* the one in the 1st menu */
d136 17
a152 41
@@@@ -463,23 +463,23 @@@@
 	      km->how_many = 1;
 	      folder_keys[MAIN_KEY].name = "E";
 	      folder_keys[MAIN_KEY].label = do_what != Subscribe ? 
-                                               "ExitSelect" : "ExitSubscb";
+                                               "}" : "ExitSubsc";
 
 	      folder_keys[SELECT_KEY].name = "S";
 	      folder_keys[SELECT_KEY].label = do_what != Subscribe ?
-                                               "[Select]" : "[Subscribe]";
+                                               "[]" : "[q\\]";
 	      KS_OSDATASET(&folder_keys[SELECT_KEY], KS_NONE);
 	      clrbitn(OTHER_KEY, bitmap);
 	      clrbitn(RENAME_KEY, bitmap);
 	      if(do_what == Subscribe){
 		  if(doing_listmode){
 		      folder_keys[DELETE_KEY].name = "X";
-		      folder_keys[DELETE_KEY].label = "[Set/Unset]";
-		      folder_keys[SELECT_KEY].label = "Subscribe";
+		      folder_keys[DELETE_KEY].label = "[]w/]w]";
+		      folder_keys[SELECT_KEY].label = "q\\";
 		  }
 		  else{
 		      folder_keys[DELETE_KEY].name = "L";
-		      folder_keys[DELETE_KEY].label = "ListMode";
+		      folder_keys[DELETE_KEY].label = "CҦ";
 		  }
 	      }
 	      else
@@@@ -610,8 +610,8 @@@@
 
 
             /*---------------------- Key left --------------*/
+          case KEY_LEFT:
 	  case ctrl('B'):
-	  case KEY_LEFT:
 	  case PF5:
 	  case 'p':
 	    if(fs->folder_index > 0 && ALL_FOUND(fs->context)){
@@@@ -628,7 +628,18 @@@@
 		  fs->folder_index = 0;
d155 4
a158 13
-	      q_status_message(SM_ORDER,0,1,"Already on first folder.");
+		{
+			/* GaryLee :3
+				q_status_message(0,0,1,"\007wgbĤ@@ӫH󧨤F.");
+			*/
+			if((do_what != FolderMaint && ch == 'm')
+				|| (do_what == FolderMaint && ch == 'e'))
+				goto bleep;
+			ps_global->redrawer = (void (*)())NULL;
+			for(tc = fs->context_list; tc ; tc = tc->next)
+				free_folders_in_context(tc);
+			return(0);
+		}
d160 6
a166 27
  
@@@@ -996,8 +1007,7 @@@@
                 /*-- save message, subscribe or post --- */
                 if((do_what == GetFcc || do_what == SaveMessage)
 		   && (fs->context->type & FTYPE_BBOARD)) {
-                    q_status_message(SM_ORDER | SM_DING, 3, 4,
-		     "Can't save messages to bulletin boards or news groups!");
+                    q_status_message(SM_ORDER | SM_DING, 3, 4, "LkNTsܹqlGiηsDոsW!");
                     break;
                 }
 
@@@@ -2407,7 +2417,7 @@@@
     folder  = new_f->name;
     ren_cur = strcmp(folder, ps_global->cur_folder) == 0;
 
-    prompt = "Rename folder to : ";
+    prompt = "NHXW: ";
     help   = NO_HELP;
     strcpy(new_foldername, folder);
     while(1) {
@@@@ -2608,7 +2618,7 @@@@
 	    && strcmp(folder, ps_global->cur_folder) == 0)
       close_opened++;
 
-    sprintf(ques_buf, "Really delete \"%s\"%s", folder, 
+    sprintf(ques_buf, "TwR \"%s\"%s", folder, 
 	    close_opened ? " (the currently open folder)" : "");
d168 113
a280 1
     if((ret=want_to(ques_buf, 'n', 'x', NO_HELP, 0, 0)) != 'y'){
@
