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.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.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	99.03.15.01.45.42;	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.40;	author vanilla;	state Exp;
branches;
next	1.1;

1.1
date	98.02.02.14.34.40;	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/pine.c.orig	Tue Sep 21 07:17:58 1999
+++ pine/pine.c	Thu Oct 14 12:13:57 1999
@@@@ -115,12 +115,12 @@@@
 	OTHER_MENU,
 	NULL_MENU,
 	NULL_MENU,
-	{"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,
 	NULL_MENU,
 
@@@@ -130,10 +130,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},
 	RCOMPOSE_MENU,
 	NULL_MENU};
 INST_KEY_MENU(main_keymenu, main_keys);
@@@@ -542,7 +542,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,
@@@@ -551,15 +551,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);
@@@@ -771,7 +771,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;
@@@@ -781,7 +781,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;
@@@@ -793,7 +793,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){
@@@@ -812,7 +812,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);
 		    }
@@@@ -959,25 +959,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}
 };
 
@@@@ -1307,7 +1307,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;
 	    }
 
@@@@ -1335,7 +1335,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");
 
 	    break;
 
@@@@ -1351,14 +1351,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;
 
@@@@ -1615,7 +1615,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;
     }
@@@@ -1784,15 +1784,15 @@@@
 {
     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	*rules    = "Rules";
-    char	*color    = "Kolor";
+    char        *printer  = "L";
+    char        *passwd   = "]wsKX";
+    char        *config   = "ҳ]w";
+    char        *update   = "s";
+    char	*sigedit  = "sñW";
+    char	*abooks   = "a}ï";
+    char	*clctns   = "`C";
+    char	*rules    = "Wh";
+    char	*color    = "m";
 #ifdef	ENABLE_LDAP
     char	*dir      = "Directory";
 #endif
@@@@ -1881,13 +1881,13 @@@@
     }
 
     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';
     }
 
@@@@ -2021,7 +2021,7 @@@@
 	opts[ekey_num].ch      = 'a';
 	opts[ekey_num].rval    = 'a';
 	opts[ekey_num].name    = "A";
-	opts[ekey_num++].label = "Addrbook";
+	opts[ekey_num++].label = "a}ï";
     }
 
     if(F_OFF(F_DISABLE_ROLES_SETUP,ps)){ /* roles are allowed */
@@@@ -2031,7 +2031,7 @@@@
 	opts[ekey_num].ch      = 'r';
 	opts[ekey_num].rval    = 'r';
 	opts[ekey_num].name    = "R";
-	opts[ekey_num++].label = "Roles";
+	opts[ekey_num++].label = "";
     }
     else if(deefault != 'a')
       deefault = 's';
@@@@ -2039,7 +2039,7 @@@@
     opts[ekey_num].ch      = 's';
     opts[ekey_num].rval    = 's';
     opts[ekey_num].name    = "S";
-    opts[ekey_num++].label = "SetScores";
+    opts[ekey_num++].label = "]wo";
 
 #ifndef	_WINDOWS
     if(ps->color_style != COL_NONE && pico_hascolor()){
@@@@ -2050,7 +2050,7 @@@@
 	opts[ekey_num].ch      = 'i';
 	opts[ekey_num].rval    = 'i';
 	opts[ekey_num].name    = "I";
-	opts[ekey_num++].label = "Indexcolor";
+	opts[ekey_num++].label = "ަm";
 #ifndef	_WINDOWS
     }
 #endif
@@@@ -2058,7 +2058,7 @@@@
     opts[ekey_num].ch      = 'f';
     opts[ekey_num].rval    = 'f';
     opts[ekey_num].name    = "F";
-    opts[ekey_num++].label = "Filters";
+    opts[ekey_num++].label = "Lo";
 
     opts[ekey_num].ch    = -1;
 
@@@@ -2096,14 +2096,14 @@@@
     HELP_MENU,
     NULL_MENU,
     {"E",NULL,{MC_EXIT,1,{'e',ctrl('M'),ctrl('J')}},KS_NONE},
-    {"Ret","[Be Counted!]",{MC_VIEW_HANDLE,2,{ctrl('M'),ctrl('J')}},KS_NONE},
+    {"Ret","[CJϥΪ`p]",{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
@@@@ -2202,13 +2202,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.keys.menu	   = &km;
 		km		   = nuov_keymenu;
@@@@ -2218,11 +2218,11 @@@@
 		setbitmap(sargs.keys.bitmap);
 
 		if(ps->phone_home){
-		    km.keys[NUOV_EXIT].label = "Exit this greeting";
+		    km.keys[NUOV_EXIT].label = "}";
 		    km.keys[NUOV_EXIT].bind.nch = 1;
 		}
 		else{
-		    km.keys[NUOV_EXIT].label	= "[Exit this greeting]";
+		    km.keys[NUOV_EXIT].label	= "[}]";
 		    km.keys[NUOV_EXIT].bind.nch = 3;
 		    clrbitn(NUOV_VIEW, sargs.keys.bitmap);
 		}
@@@@ -2303,7 +2303,7 @@@@
 	break;
 
       case MC_RELNOTES :
-	helper(h_news, "PINE RELEASE NOTES", 0);
+	helper(h_news, "PINE XKn", 0);
 	ps_global->mangled_screen = 1;
 	break;
 
@@@@ -2422,7 +2422,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;
     }
@


1.6
log
@Update to version 4.20.

PR:		14575
Submitted by:	maintainer
@
text
@@


1.5
log
@Update to version 4.10.

PR:		10245
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/pine.c.orig	Sat Jan 30 01:59:01 1999
+++ pine/pine.c	Tue Feb 23 15:50:13 1999
@@@@ -114,12 +114,12 @@@@
d20 1
a20 1
@@@@ -129,11 +129,11 @@@@
a27 1
-	{"#","Role",{MC_ROLE,1,{'#'}},KS_NONE},
d32 1
a32 1
+	{"#","",{MC_ROLE,1,{'#'}},KS_NONE},
d35 1
a35 2
 #define MAIN_HELP_KEY		0
@@@@ -528,7 +528,7 @@@@
d44 1
a44 1
@@@@ -537,15 +537,15 @@@@
d63 1
a63 1
@@@@ -761,7 +761,7 @@@@
d72 1
a72 1
@@@@ -771,7 +771,7 @@@@
d81 1
a81 1
@@@@ -783,7 +783,7 @@@@
d90 1
a90 1
@@@@ -802,7 +802,7 @@@@
d99 1
a99 1
@@@@ -949,25 +949,25 @@@@
d133 1
a133 1
@@@@ -1295,7 +1295,7 @@@@
d142 1
a142 1
@@@@ -1323,7 +1323,7 @@@@
d151 1
a151 1
@@@@ -1339,14 +1339,14 @@@@
d168 1
a168 1
@@@@ -1603,7 +1603,7 @@@@
d177 1
a177 1
@@@@ -1772,14 +1772,14 @@@@
d188 2
a189 1
-    char	*roles    = "Roles";
d197 2
a198 1
+    char	*roles    = "";
d202 1
a202 1
@@@@ -1864,13 +1864,13 @@@@
d219 46
a264 1
@@@@ -1996,14 +1996,14 @@@@
d281 1
a281 1
@@@@ -2100,13 +2100,13 @@@@
d298 1
a298 1
@@@@ -2116,11 +2116,11 @@@@
d312 1
a312 1
@@@@ -2201,7 +2201,7 @@@@
d321 1
a321 1
@@@@ -2320,7 +2320,7 @@@@
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/pine.c.orig	Wed Jul 22 06:02:36 1998
+++ pine/pine.c	Tue Aug  4 12:42:20 1998
@@@@ -107,12 +107,12 @@@@
d20 1
a20 1
@@@@ -122,10 +122,10 @@@@
d28 1
d33 1
a33 1
 	NULL_MENU,
d36 2
a37 1
@@@@ -511,7 +511,7 @@@@
d46 1
a46 1
@@@@ -520,15 +520,15 @@@@
d65 1
a65 1
@@@@ -709,7 +709,7 @@@@
d74 1
a74 1
@@@@ -719,7 +719,7 @@@@
d83 1
a83 1
@@@@ -731,7 +731,7 @@@@
d92 1
a92 1
@@@@ -750,7 +750,7 @@@@
d101 1
a101 1
@@@@ -895,25 +895,25 @@@@
d135 1
a135 1
@@@@ -1206,7 +1206,7 @@@@
d144 1
a144 1
@@@@ -1234,7 +1234,7 @@@@
d153 1
a153 1
@@@@ -1250,14 +1250,14 @@@@
d170 1
a170 1
@@@@ -1486,7 +1486,7 @@@@
d179 1
a179 1
@@@@ -1651,13 +1651,13 @@@@
d190 1
d198 1
d202 1
a202 1
@@@@ -1735,13 +1735,13 @@@@
d219 1
a219 1
@@@@ -1854,14 +1854,14 @@@@
d236 1
a236 1
@@@@ -1950,13 +1950,13 @@@@
a250 1
 		sargs.force_h	   = 1;
d252 2
a253 1
@@@@ -1967,11 +1967,11 @@@@
d267 1
a267 1
@@@@ -2029,7 +2029,7 @@@@
d276 1
a276 1
@@@@ -2148,7 +2148,7 @@@@
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 147
a147 17
--- pine/reply.c.orig	Wed Jul 15 08:40:00 1998
+++ pine/reply.c	Tue Jul 28 08:35:06 1998
@@@@ -88,9 +88,9 @@@@
 /*
  * Little defs to keep the code a bit neater...
  */
-#define	FRM_PMT	"Use \"Reply-To:\" address instead of \"From:\" address"
-#define	ALL_PMT		"Reply to all recipients"
-#define	NEWS_PMT	"Follow-up to news group(s), Reply via email to author or Both? "
+#define	FRM_PMT	"ϥ \"Reply-To:\" a}N \"From:\" a}"
+#define	ALL_PMT		"^еҦH"
+#define	NEWS_PMT	"^ЦܷsDոsA^絹@@̩Ψ̬ҭnH"
 
 /*
  * standard type of storage object used for body parts...
@@@@ -411,7 +411,7 @@@@
 #endif
d149 1
a149 14
     /* partially formatted outgoing message */
-    pine_send(outgoing, &body, "COMPOSE MESSAGE REPLY",
+    pine_send(outgoing, &body, "sH^",
 	      fcc.tptr, &reply, NULL, NULL, NULL, 0);
   done:
     pine_free_body(&body);
@@@@ -485,7 +485,7 @@@@
 			 (ADDRESS *) NULL, env->from, 0);
 
     if(ret == 'x') {
-	cmd_cancelled("Reply");
+	cmd_cancelled("^");
 	return(0);
     }
d151 2
a152 7
@@@@ -534,7 +534,7 @@@@
 	       || (*saved_cc || *saved_resent))){
 	    *flags &= ~RSF_QUERY_REPLY_ALL;
 	    if((ret=want_to(ALL_PMT,'n','x',NO_HELP,WT_SEQ_SENSITIVE)) == 'x'){
-		cmd_cancelled("Reply");
+		cmd_cancelled("^");
 		return(0);
d154 24
a177 2
 	    else if(ret == 'y')
@@@@ -1099,8 +1099,8 @@@@
d179 34
a212 100
     int ret, edited = 0;
     static ESCKEY_S rtq_opts[] = {
-	{'y', 'y', "Y", "Yes"},
-	{'n', 'n', "N", "No"},
+	{'y', 'y', "Y", "O"},
+	{'n', 'n', "N", "_"},
 	{-1, 0, NULL, NULL},	                  /* may be overridden below */
 	{-1, 0, NULL, NULL}
     };
@@@@ -1110,19 +1110,18 @@@@
       return(1);
 
     while(1){
-	sprintf(tmp_20k_buf, "Include %s%soriginal message%s in Reply%s%s%s? ",
-		(many > 1L) ? comatose(many) : "",
-		(many > 1L) ? " " : "",
-		(many > 1L) ? "s" : "",
-		F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? " (using \"" : "",
+	sprintf(tmp_20k_buf, "b^%s%s%s]t%s%s쥻TH",
+		F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? "]ϥ \"" : "",
 		F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? *prefix : "",
-		F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? "\")" : "");
+		F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? "\" ިХܥN^" : "",
+		(many > 1L) ? comatose(many) : "",
+		(many > 1L) ? " " : "");
 
 	if(F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps)){
 	    rtq_opts[2].ch    = ctrl('R');
 	    rtq_opts[2].rval  = 'r';
 	    rtq_opts[2].name  = "^R";
-	    rtq_opts[2].label = "Edit Indent String";
+	    rtq_opts[2].label = "sިХܥN";
 	}
 	else
 	  rtq_opts[2].ch    = -1;
@@@@ -1133,7 +1132,7 @@@@
 				   rtq_opts, edited ? 'y' : 'n',
 				   'x', NO_HELP, RB_SEQ_SENSITIVE)){
 	  case 'x':
-	    cmd_cancelled("Reply");
+	    cmd_cancelled("^");
 	    return(-1);
 
 	  case 'r':
@@@@ -1152,7 +1151,7 @@@@
 
 		    switch(optionally_enter(buf, ps->ttyo->screen_rows > 4
 					    ? -FOOTER_ROWS(ps_global) : -1,
-					    0, 63, "Reply prefix : ", 
+					    0, 63, "ިХܥNG", 
 					    NULL, NO_HELP, &flags)){
 		      case 0:		/* entry successful, continue */
 			if(flags & OE_USER_MODIFIED){
@@@@ -1165,7 +1164,7 @@@@
 			break;
 
 		      case 1:
-			cmd_cancelled("Reply");
+			cmd_cancelled("^");
 
 		      case -1:
 			return(-1);
@@@@ -1518,9 +1517,9 @@@@
     ENVELOPE *env, *outgoing;
 {
     int    ret = 1;
-    static ESCKEY_S news_opt[] = { {'f', 'f', "F", "Follow-up"},
-				   {'r', 'r', "R", "Reply"},
-				   {'b', 'b', "B", "Both"},
+    static ESCKEY_S news_opt[] = { {'f', 'f', "F", "^ЦܪW"},
+				   {'r', 'r', "R", "^@@"},
+				   {'b', 'b', "B", "̬ҭn"},
 				   {-1, 0, NULL, NULL} };
 
     if(env->newsgroups && *env->newsgroups && !reply_poster_followup(env))
@@@@ -1544,7 +1543,7 @@@@
 
 	case 'x' :		/* cancel or unknown response */
 	default  :
-	  cmd_cancelled("Reply");
+	  cmd_cancelled("^");
 	  ret = 0;
 	  break;
       }
@@@@ -1552,7 +1551,7 @@@@
     if(ret > 1){
 	if(env->followup_to){
 	    q_status_message(SM_ORDER, 2, 3,
-			     "Posting to specified Followup-To groups");
+			     "ZnܯSw^вոs");
 	    outgoing->newsgroups = cpystr(env->followup_to);
 	}
 	else if(!outgoing->newsgroups)
@@@@ -1710,7 +1709,7 @@@@
      * up...
      */
     if(ret == 'x'){
-	q_status_message(SM_ORDER, 0, 3, "Forward message cancelled");
+	q_status_message(SM_ORDER, 0, 3, "HH");
 	goto clean_early;
a213 8
     else if(ret == 'y'){			/* attach message[s]!!! */
@@@@ -1842,7 +1841,7 @@@@
       pine_simple_send(outgoing, &body, NULL, NULL, NULL, 1);
     else			/* partially formatted outgoing message */
       pine_send(outgoing, &body,
-		ps->nr_mode ? "SEND MESSAGE" : "FORWARD MESSAGE",
+		ps->nr_mode ? "eXH" : "HH",
 		NULL, NULL, NULL, NULL, NULL, FALSE);
d215 66
a280 1
   clean:
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 82
a82 50
--- pine/takeaddr.c.orig	Fri Jun 26 02:26:36 1998
+++ pine/takeaddr.c	Wed Jul 15 17:02:38 1998
@@@@ -785,7 +785,7 @@@@
     return;
 
 take_to_addrbooks_cancel:
-    cancel_warning(NO_DING, "addition");
+    cancel_warning(NO_DING, "sW");
     if(tas && *tas){
 	restore_state(&((*tas)->state));
 	(*tas)->pab   = NULL;
@@@@ -1267,7 +1267,7 @@@@
 	    break;
 
 	  case MC_EXIT:				/* exit takeaddr screen */
-	    cancel_warning(NO_DING, "addition");
+	    cancel_warning(NO_DING, "sW");
 	    ret = 1;
 	    done++;
 	    break;
@@@@ -2698,7 +2698,7 @@@@
     
     switch(j){
       case 'x':
-	cancel_warning(NO_DING, "save");
+	cancel_warning(NO_DING, "s");
 	return;
 
       case 'e':
@@@@ -2798,7 +2798,7 @@@@
 
     switch(i){
       case 'x':
-	cancel_warning(NO_DING, "export");
+	cancel_warning(NO_DING, "ץX");
 	return;
     
       case 'a':
@@@@ -4737,7 +4737,7 @@@@
 	    
 	    switch(j){
 	      case 'x':
-		cancel_warning(NO_DING, "Save");
+		cancel_warning(NO_DING, "s");
 		break;
 
 	      case 'e':
@@@@ -4957,7 +4957,7 @@@@
 	
 	switch(j){
d84 72
a155 5
-	    cancel_warning(NO_DING, "Export");
+	    cancel_warning(NO_DING, "ץX");
 	    break;
 	
 	  case 't':
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@d1 4
a4 3
--- pine/screen.c.orig	Wed May  8 09:05:40 1996
+++ pine/screen.c	Sat Jan 17 21:09:32 1998
@@@@ -380,7 +380,7 @@@@
d6 8
d15 42
a56 6
 static struct key cancel_keys[] = 
-     {{NULL,NULL,KS_NONE},            {"^C","Cancel",KS_NONE},
+     {{NULL,NULL,KS_NONE},            {"^C","",KS_NONE},
       {NULL,NULL,KS_NONE},            {NULL,NULL,KS_NONE},
       {NULL,NULL,KS_NONE},            {NULL,NULL,KS_NONE},
       {NULL,NULL,KS_NONE},            {NULL,NULL,KS_NONE},
@
