freebsd-ports/chinese/pine4/files/patch-bc

--- pine/mailpart.c.orig	Wed Aug 19 10:37:25 1998
+++ pine/mailpart.c	Wed Aug 19 10:45:24 1998
@@ -134,18 +134,18 @@
        {HELP_MENU,
 	OTHER_MENU,
 	{"<",NULL,{MC_EXIT,2,{'<',','}},KS_EXITMODE},
-	{">","[View]",{MC_VIEW_ATCH,5,{'v','>','.',ctrl('M'),ctrl('J')}},
+	{">","[<5B>˵<EFBFBD>]",{MC_VIEW_ATCH,5,{'v','>','.',ctrl('M'),ctrl('J')}},
 	  KS_VIEW},
-	{"P", "PrevAttch",{MC_PREVITEM,4,{'p',ctrl('B'),ctrl('P'),KEY_UP}},
+	{"P", "<22>e<EFBFBD>@<40><><EFBFBD><EFBFBD>",{MC_PREVITEM,4,{'p',ctrl('B'),ctrl('P'),KEY_UP}},
 	  KS_PREVMSG},
-	{"N", "NextAtch",
+	{"N", "<22><><EFBFBD>@<40><><EFBFBD><EFBFBD>",
 	 {MC_NEXTITEM, 5, {'n','\t',ctrl('F'),ctrl('N'), KEY_DOWN}},
 	 KS_NEXTMSG},
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
 	DELETE_MENU,
 	UNDELETE_MENU,
-	{"S", "Save", {MC_SAVETEXT,1,{'s'}}, KS_SAVE},
+	{"S", "<22>s<EFBFBD><73>", {MC_SAVETEXT,1,{'s'}}, KS_SAVE},
 	{NULL, NULL, {MC_EXPORT, 1, {'e'}}, KS_EXPORT},
 
 	HELP_MENU,
@@ -154,9 +154,9 @@
 	QUIT_MENU,
 	PIPE_MENU,
 	BOUNCE_MENU,
-	{"A","AboutAttch",{MC_ABOUTATCH,1,{'a'}},KS_NONE},
+	{"A","<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",{MC_ABOUTATCH,1,{'a'}},KS_NONE},
 	WHEREIS_MENU,
-	{"%", "Print", MC_PRINTMSG,1,{'%'}, KS_PRINT},
+	{"%", "<22>C<EFBFBD>L", MC_PRINTMSG,1,{'%'}, KS_PRINT},
 	INDEX_MENU,
 	REPLY_MENU,
 	FORWARD_MENU};
@@ -173,11 +173,11 @@
 static struct key att_view_keys[] =
        {HELP_MENU,
 	OTHER_MENU,
-	{"<",NULL,{MC_EXIT,2,{'<',','}},KS_EXITMODE},
-	{"Ret","[View Hilite]",{MC_VIEW_HANDLE,3,
+	{"<",NULL,{MC_EXIT,3,{'<',',',KEY_LEFT}},KS_EXITMODE},
+	{"Ret","[<5B>˵<EFBFBD> Hilite]",{MC_VIEW_HANDLE,3,
 				{ctrl('m'),ctrl('j'),KEY_RIGHT}},KS_NONE},
-	{"^B","Prev URL",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
-	{"^F","Next URL",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
+	{"^B","<22>e<EFBFBD>@ URL",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
+	{"^F","<22><><EFBFBD>@ URL",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
 	DELETE_MENU,
@@ -193,7 +193,7 @@
 	BOUNCE_MENU,
 	NULL_MENU,
 	WHEREIS_MENU,
-	{"%", "Print", MC_PRINTMSG,1,{'%'}, KS_PRINT},
+	{"%", "<22>C<EFBFBD>L", MC_PRINTMSG,1,{'%'}, KS_PRINT},
 	NULL_MENU,
 	REPLY_MENU,
 	FORWARD_MENU};
@@ -323,12 +323,12 @@
 
     if(mn_total_cur(ps->msgmap) > 1L){
 	q_status_message(SM_ORDER | SM_DING, 0, 3,
-			 "Can only view one message's attachments at a time!");
+			 "<22>P<EFBFBD>@<40>ɶ<EFBFBD><C9B6>ȯ<EFBFBD><C8AF>˵<EFBFBD><CBB5>@<40>ʫH<CAAB><48><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>I");
 	return;
     }
-    else if(ps->atmts && ps->atmts->description && !(ps->atmts + 1)->description)
+    else if(ps->atmts && !(ps->atmts + 1)->description)
       q_status_message1(SM_ASYNC, 0, 3,
-	"Message %s has only one part (the message body), and no attachments.",
+	"<22>H<EFBFBD><48> %s <20>Ȧ<EFBFBD><C8A6>@<40><><EFBFBD><EFBFBD>(<28>H<EFBFBD><48><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)<29>A<EFBFBD>S<EFBFBD><53><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C",
 	long2string(mn_get_cur(ps->msgmap)));
 
     /*
@@ -471,7 +471,7 @@
 	  break;
 
 	if(ps->mangled_header){
-	    set_titlebar("ATTACHMENT INDEX", ps->mail_stream,
+	    set_titlebar("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", ps->mail_stream,
 			 ps->context_current, ps->cur_folder, ps->msgmap, 1,
 			 MessageNumber, 0, 0);
 	    ps->mangled_header = 0;
@@ -535,7 +535,7 @@
 		  clrbitn(ATT_PRINT_KEY, bitmap);
 
 		km->keys[ATT_EXPORT_KEY].name  = "E";
-		km->keys[ATT_EXPORT_KEY].label = "Export";
+		km->keys[ATT_EXPORT_KEY].label = "<22>ץX";
 	    }
 
 	    if(km_popped){
@@ -630,7 +630,7 @@
 	    if(ctmp = next_attline(current))
 	      current = ctmp;
 	    else
-	      q_status_message(SM_ORDER, 0, 1, "Already on last attachment");
+	      q_status_message(SM_ORDER, 0, 1, "<22>w<EFBFBD>g<EFBFBD><67><EFBFBD>̫<EFBFBD><CCAB>@<40><><EFBFBD><EFBFBD><EFBFBD>F");
 
 	    break;
 
@@ -638,7 +638,7 @@
 	    if(ctmp = prev_attline(current))
 	      current = ctmp;
 	    else
-	      q_status_message(SM_ORDER, 0, 1, "Already on first attachment");
+	      q_status_message(SM_ORDER, 0, 1, "<22>w<EFBFBD>g<EFBFBD><67><EFBFBD>Ĥ@<40>Ӫ<EFBFBD><D3AA><EFBFBD><EFBFBD>F");
 
 	    break;
 
@@ -652,7 +652,7 @@
 	    }
 	    else
 	      q_status_message(SM_ORDER, 0, 1,
-			       "Already on last page of attachments");
+			       "<22>w<EFBFBD>g<EFBFBD>b<EFBFBD><62><EFBFBD>󪺳̫<F3AABAB3><CCAB>@<40><><EFBFBD>F");
 	    
 
 	    break;
@@ -673,7 +673,7 @@
 	    }
 	    else
 	      q_status_message(SM_ORDER, 0, 1,
-			       "Already on first page of attachments");
+			       "<22>w<EFBFBD>g<EFBFBD>b<EFBFBD><62><EFBFBD>󪺲Ĥ@<40><><EFBFBD>F");
 
 	    break;
 
@@ -1041,7 +1041,7 @@
 {
     bitmap_t	 bitmap;
 
-    set_titlebar("ATTACHMENT INDEX", ps_global->mail_stream,
+    set_titlebar("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", ps_global->mail_stream,
 		 ps_global->context_current, ps_global->cur_folder,
 		 ps_global->msgmap, 1, FolderName,0,0);
 
@@ -1210,7 +1210,7 @@
     gf_io_t     pc;
     STORE_S    *store;
     static ESCKEY_S att_save_opts[] = {
-	{ctrl('T'), 10, "^T", "To Files"},
+	{ctrl('T'), 10, "^T", "<22>ɮצC<D7A6><43>"},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL}};
@@ -1243,7 +1243,7 @@
 	att_save_opts[++r].ch  = ctrl('V');
 	att_save_opts[r].rval  = 12;
 	att_save_opts[r].name  = "^V";
-	att_save_opts[r].label = "Downld Msg";
+	att_save_opts[r].label = "<22>U<EFBFBD><55><EFBFBD>H<EFBFBD><48>";
     }
 #endif	/* !(DOS || MAC) */
 
@@ -1251,7 +1251,7 @@
 	att_save_opts[++r].ch  =  ctrl('I');
 	att_save_opts[r].rval  = 11;
 	att_save_opts[r].name  = "TAB";
-	att_save_opts[r].label = "Complete";
+	att_save_opts[r].label = "<22><><EFBFBD><EFBFBD>";
     }
 
     att_save_opts[++r].ch = -1;
@@ -1470,7 +1470,7 @@
 				a->number, 
 				save_folder);
 	    else if(rv == -1)
-	      cmd_cancelled("Attached message Save");
+	      cmd_cancelled("<22>s<EFBFBD>J<EFBFBD><4A><EFBFBD>[<5B>T<EFBFBD><54>");
 	    /* else whatever broke in save_fetch_append shoulda bitched */
 
 	    so_give(&so);
@@ -1546,11 +1546,11 @@
 
 	if(rv == 1)
 	  q_status_message2(SM_ORDER, 0, 4,
-			    "Attached digest (part %s) saved to \"%s\"",
+			    "<22><><EFBFBD>[<5B><> digest(<28><> %s <20><><EFBFBD><EFBFBD>) <20>s<EFBFBD><73> \"%s\"",
 			    a->number, 
 			    save_folder);
 	else if(rv == -1)
-	  cmd_cancelled("Attached digest Save");
+	  cmd_cancelled("<22>s<EFBFBD>J<EFBFBD><4A><EFBFBD>[<5B><> digest");
 	/* else whatever broke in save_fetch_append shoulda bitched */
 
 	if(our_stream)
@@ -1604,7 +1604,7 @@
     ATTACH_S *ap = a;
     STORE_S  *store;
     static ESCKEY_S opts[] = {
-	{ctrl('T'), 10, "^T", "To Files"},
+	{ctrl('T'), 10, "^T", "<22>ɮצC<D7A6><43>"},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL}};
 
@@ -1612,7 +1612,7 @@
 	opts[i].ch    =  ctrl('I');
 	opts[i].rval  = 11;
 	opts[i].name  = "TAB";
-	opts[i].label = "Complete";
+	opts[i].label = "<22><><EFBFBD><EFBFBD>";
     }
 
     filename[0] = full_filename[0] = '\0';
@@ -1625,7 +1625,7 @@
     if(rv < 0){
 	switch(rv){
 	  case -1:
-	    cmd_cancelled("Export");
+	    cmd_cancelled("<22>ץX<D7A5>ɮ<EFBFBD>");
 	    break;
 
 	  case -2:
@@ -1677,7 +1677,7 @@
     ATTACH_S *ap;
     STORE_S  *store;
     static ESCKEY_S opts[] = {
-	{ctrl('T'), 10, "^T", "To Files"},
+	{ctrl('T'), 10, "^T", "<22>ɮצC<D7A6><43>"},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL}};
 
@@ -1685,7 +1685,7 @@
 	opts[i].ch    =  ctrl('I');
 	opts[i].rval  = 11;
 	opts[i].name  = "TAB";
-	opts[i].label = "Complete";
+	opts[i].label = "<22><><EFBFBD><EFBFBD>";
     }
 
     filename[0] = full_filename[0] = '\0';
@@ -1698,7 +1698,7 @@
     if(rv < 0){
 	switch(rv){
 	  case -1:
-	    cmd_cancelled("Export");
+	    cmd_cancelled("<22>ץX<D7A5>ɮ<EFBFBD>");
 	    break;
 
 	  case -2:
@@ -1906,14 +1906,14 @@
         /*----- Can't display this type ------*/
 	if(a->body->encoding < ENCOTHER)
 	  q_status_message4(SM_ORDER | SM_DING, 3, 5,
-		     "Don't know how to display %s%s%s attachments.%s",
+		     "<22><><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s%s%s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C%s",
 			    body_type_names(a->body->type),
 			    a->body->subtype ? "/" : "",
 			    a->body->subtype ? a->body->subtype :"",
-			    (flags & DA_SAVE) ? " Try Save." : "");
+			    (flags & DA_SAVE) ? " <20>ոզs<D5A6>ɡC" : "");
 	else
 	  q_status_message1(SM_ORDER | SM_DING, 3, 5,
-			    "Don't know how to unpack \"%s\" encoding",
+			    "<22><><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD><70><EFBFBD>Ѷ} \"%s\" <20><><EFBFBD>s<EFBFBD>X",
 			    body_encodings[(a->body->encoding <= ENCMAX)
 					     ? a->body->encoding : ENCOTHER]);
 
@@ -2102,7 +2102,7 @@
 	gf_set_so_writec(&pc, store);
 	(void) decode_text(a, msgno, pc, QStatus, FM_DISPLAY | FM_HANDLES);
 	gf_clear_so_writec(store);
-	scroll_attachment("ATTACHED TEXT", store, src, handles, a, flags);
+	scroll_attachment("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>r", store, src, handles, a, flags);
 	free_handles(&handles);
 	so_give(&store);	/* free resources associated with store */
     }
@@ -2277,22 +2277,22 @@
     memset(&sargs, 0, sizeof(SCROLL_S));
     sargs.text.text    = so_text(store);
     sargs.text.src     = src;
-    sargs.text.desc    = "attachment";
+    sargs.text.desc    = "<22><><EFBFBD><EFBFBD>";
     sargs.text.handles = handles;
     sargs.bar.title    = title;
     sargs.proc.tool    = process_attachment_cmd;
     sargs.proc.data.p  = (void *) a;
     sargs.help.text    = h_mail_text_att_view;
-    sargs.help.title   = "HELP FOR ATTACHED TEXT VIEW";
+    sargs.help.title   = "<22>˵<EFBFBD><CBB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>r<EFBFBD><72><EFBFBD><EFBFBD><EFBFBD>U<EFBFBD><55><EFBFBD><EFBFBD>";
     sargs.keys.menu    = &att_view_keymenu;
     setbitmap(sargs.keys.bitmap);
 
     /* First, fix up "back" key */
     if(flags & DA_FROM_VIEW){
-	att_view_keymenu.keys[ATV_BACK_KEY].label = "MsgText";
+	att_view_keymenu.keys[ATV_BACK_KEY].label = "<22>H<EFBFBD><48><EFBFBD><EFBFBD><EFBFBD>r";
     }
     else{
-	att_view_keymenu.keys[ATV_BACK_KEY].label = "AttchIndex";
+	att_view_keymenu.keys[ATV_BACK_KEY].label = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
     }
 
     if(!handles){
@@ -2706,10 +2706,10 @@
     memset(&sargs, 0, sizeof(SCROLL_S));
     sargs.text.text  = so_text(store);
     sargs.text.src   = CharStar;
-    sargs.text.desc  = "attachment info";
-    sargs.bar.title  = "ABOUT ATTACHMENT";
+    sargs.text.desc  = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>T";
+    sargs.bar.title  = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
     sargs.help.text  = h_simple_text_view;
-    sargs.help.title = "HELP FOR \"ABOUT ATTACHMENT\"";
+    sargs.help.title = "\"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\"<22><><EFBFBD><EFBFBD><EFBFBD>U<EFBFBD><55><EFBFBD><EFBFBD>";
 
     scrolltool(&sargs);
 
@@ -2771,7 +2771,7 @@
 		else		/* partially formatted outgoing message */
 		  pine_send(outgoing, &body,
 			    ps_global->nr_mode
-			      ? "SEND MESSAGE" : "FORWARD MESSAGE",
+			      ? "<22>e<EFBFBD>X<EFBFBD>H<EFBFBD><48>" : "<22><><EFBFBD>H<EFBFBD>H<EFBFBD><48>",
 			    NULL, NULL, NULL, NULL, NULL, FALSE);
 
 		ps_global->mangled_screen = 1;
@@ -2857,7 +2857,7 @@
 		  pine_simple_send(outgoing, &body, NULL, NULL, NULL, 1);
 		else		/* partially formatted outgoing message */
 		  pine_send(outgoing, &body,
-		      ps_global->nr_mode ? "SEND MESSAGE" : "FORWARD MESSAGE",
+		      ps_global->nr_mode ? "<22>e<EFBFBD>X<EFBFBD>H<EFBFBD><48>" : "<22><><EFBFBD>H<EFBFBD>H<EFBFBD><48>",
 			    NULL, NULL, NULL, NULL, NULL, FALSE);
 
 		ps_global->mangled_screen = 1;
@@ -2954,7 +2954,7 @@
 				 tp = body_partno(stream, msgno, a->body),
 				 msgtext, prefix, include_text)){
 		/* partially formatted outgoing message */
-		pine_send(outgoing, &body, "COMPOSE MESSAGE REPLY",
+		pine_send(outgoing, &body, "<22>s<EFBFBD><73><EFBFBD>H<EFBFBD><48><EFBFBD>^<5E><>",
 			  fcc.tptr, NULL, NULL, NULL, NULL, 0);
 
 		pine_free_body(&body);
@@ -3035,7 +3035,7 @@
 
 	sprintf(prompt, "Pipe %sattachment %s to %s: ", raw ? "RAW " : "",
 		a->number, capture ? "" : "(Free Output) ");
-	pipe_opt[1].label = raw ? "DecodedData" : "Raw Data";
+	pipe_opt[1].label = raw ? "<22>ѽX<D1BD>᪺<EFBFBD><E1AABA><EFBFBD><EFBFBD>" : "<22><><EFBFBD>l<EFBFBD><6C><EFBFBD><EFBFBD>";
 	pipe_opt[2].label = capture ? "Free Output" : "Capture Output";
 	flags = OE_APPEND_CURRENT | OE_SEQ_SENSITIVE;
 	rc = optionally_enter(pipe_command, -FOOTER_ROWS(ps_global), 0,
@@ -3053,7 +3053,7 @@
 	}
 	else if(rc == 0){
 	    if(pipe_command[0] == '\0'){
-		cmd_cancelled("Pipe command");
+		cmd_cancelled("<22>ɦV<C9A6>R<EFBFBD>O");
 		break;
 	    }
 
@@ -3127,7 +3127,7 @@
 	    break;
 	}
 	else if(rc == 1){
-	    cmd_cancelled("Pipe");
+	    cmd_cancelled("<22>ɦV");
 	    break;
 	}
 	else if(rc = 3)