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


1.9
date	2000.11.17.19.06.53;	author keith;	state dead;
branches;
next	1.8;

1.8
date	99.12.27.00.58.48;	author steve;	state Exp;
branches;
next	1.7;

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

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

1.5
date	98.10.10.04.29.24;	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.9
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/mailcmd.c.orig	Wed Nov 17 09:51:48 1999
+++ pine/mailcmd.c	Fri Nov 19 18:24:04 1999
@@@@ -115,39 +115,39 @@@@
 /*
  * List of Select options used by apply_* functions...
  */
-static char *sel_pmt1 = "ALTER message selection : ";
+static char *sel_pmt1 = "H󪺿ܡG";
 ESCKEY_S sel_opts1[] = {
-    {'a', 'a', "A", "unselect All"},
+    {'a', 'a', "A", "Ҧ"},
     {'c', 'c', "C", NULL},
-    {'b', 'b', "B", "Broaden selctn"},
-    {'n', 'n', "N", "Narrow selctn"},
-    {'f', 'f', "F", "Flip selected"},
+    {'b', 'b', "B", "Xj"},
+    {'n', 'n', "N", "Yp"},
+    {'f', 'f', "F", ""},
     {-1, 0, NULL, NULL}
 };
 
 
-char *sel_pmt2 = "SELECT criteria : ";
+char *sel_pmt2 = "ܼзǡG";
 static ESCKEY_S sel_opts2[] = {
-    {'a', 'a', "A", "select All"},
-    {'c', 'c', "C", "select Cur"},
-    {'n', 'n', "N", "Number"},
-    {'d', 'd', "D", "Date"},
-    {'t', 't', "T", "Text"},
-    {'s', 's', "S", "Status"},
+    {'a', 'a', "A", "ܩҦ"},
+    {'c', 'c', "C", "ܥثe"},
+    {'n', 'n', "N", "ƥ"},
+    {'d', 'd', "D", ""},
+    {'t', 't', "T", "r"},
+    {'s', 's', "S", "A"},
     {-1, 0, NULL, NULL}
 };
 
 
-static char *sel_pmt3 = "APPLY command : ";
+static char *sel_pmt3 = "MΩROG";
 static ESCKEY_S sel_opts3[] = {
-    {'d', 'd',  "D", "Del"},
-    {'u', 'u',  "U", "Undel"},
-    {'r', 'r',  "R", "Reply"},
-    {'f', 'f',  "F", "Forward"},
-    {'%', '%',  "%", "Print"},
-    {'t', 't',  "T", "TakeAddr"},
-    {'s', 's',  "S", "Save"},
-    {'e', 'e',  "E", "Export"},
+    {'d', 'd',  "D", "R"},
+    {'u', 'u',  "U", "_R"},
+    {'r', 'r',  "R", "^"},
+    {'f', 'f',  "F", "H"},
+    {'%', '%',  "%", "CL"},
+    {'t', 't',  "T", "a}ï"},
+    {'s', 's',  "S", "s"},
+    {'e', 'e',  "E", "ץX"},
     { -1,   0, NULL, NULL},
     { -1,   0, NULL, NULL},
     { -1,   0, NULL, NULL},
@@@@ -157,24 +157,24 @@@@
 
 
 static char *sel_flag = 
-    "Select New, Deleted, Answered, or Important messages ? ";
+    " sAwRAw^ЪAέnHH";
 static char *sel_flag_not = 
-    "Select NOT New, NOT Deleted, NOT Answered or NOT Tagged msgs ? ";
+    " DsADwRADw^ЪAΫDQаOHH";
 static ESCKEY_S sel_flag_opt[] = {
-    {'n', 'n', "N", "New"},
-    {'*', '*', "*", "Important"},
-    {'d', 'd', "D", "Deleted"},
-    {'a', 'a', "A", "Answered"},
-    {'!', '!', "!", "Not"},
+    {'n', 'n', "N", "s"},
+    {'*', '*', "*", "n"},
+    {'d', 'd', "D", "wR"},
+    {'a', 'a', "A", "w^Ъ"},
+    {'!', '!', "!", "D"},
     {-1, 0, NULL, NULL}
 };
 
 
 static ESCKEY_S sel_date_opt[] = {
     {0, 0, NULL, NULL},
-    {ctrl('P'), 12, "^P", "Prev Day"},
-    {ctrl('N'), 13, "^N", "Next Day"},
-    {ctrl('X'), 11, "^X", "Cur Msg"},
+    {ctrl('P'), 12, "^P", "e@@"},
+    {ctrl('N'), 13, "^N", "@@"},
+    {ctrl('X'), 11, "^X", "ثe"},
     {ctrl('W'), 14, "^W", "Toggle When"},
     {KEY_UP,    12, "", ""},
     {KEY_DOWN,  13, "", ""},
@@@@ -183,23 +183,23 @@@@
 
 
 static char *sel_text =
-    "Select based on To, From, Cc, Recip, Subject fields or All message text ? ";
+    "ܥH HAHHAƥA̡ADD 쬰DAΩҦTrH";
 static char *sel_not_text =
-    "Select based on NOT To, From, Cc, Recip, Subject fields or All message text ? ";
+    "ܡuvH HAHHAƥA̡ADD 쬰DAΩҦTrH";
 static ESCKEY_S sel_text_opt[] = {
-    {'f', 'f', "F", "From"},
-    {'s', 's', "S", "Subject"},
-    {'t', 't', "T", "To"},
-    {'a', 'a', "A", "All Text"},
-    {'c', 'c', "C", "Cc"},
-    {'!', '!', "!", "Not"},
-    {'r', 'r', "R", "Recipient"},
-    {'p', 'p', "P", "Participant"},
+    {'f', 'f', "F", "HH"},
+    {'s', 's', "S", "DD"},
+    {'t', 't', "T", "H"},
+    {'a', 'a', "A", "ҦTr"},
+    {'c', 'c', "C", "ƥ"},
+    {'!', '!', "!", "D"},
+    {'r', 'r', "R", ""},
+    {'p', 'p', "P", "Y"},
     {-1, 0, NULL, NULL}
 };
 
 static char *select_num =
-  "Enter comma-delimited list of numbers (dash between ranges): ";
+  "JHrIjƦrC]dH}鸹Ϥ^G";
 
 
 /*----------------------------------------------------------------------
@@@@ -248,7 +248,7 @@@@
       case MC_HELP :
 	if(state->nr_mode) {
 	    q_status_message(SM_ORDER, 0, 3,
-			     "No help text currently available");
+			     "ثeLkor");
 	    break;
 	}
 
@@@@ -277,7 +277,7 @@@@
 
           /*------- View message text --------*/
       case MC_VIEW_TEXT :
-	if(any_messages(msgmap, NULL, "to View")){
+	if(any_messages(msgmap, NULL, "i˵")){
 	    state->next_screen = mail_view_screen;
 #if	defined(DOS) && !defined(WIN32)
 	    flush_index_cache();		/* save room on PC */
@@@@ -301,10 +301,10 @@@@
 		mn_dec_cur(stream, msgmap);
 		if(i == mn_get_cur(msgmap))
 		  q_status_message(SM_ORDER, 0, 2,
-				  "Already on first message in Zoomed Index");
+				  "wgYޤĤ@@ʰTF");
 	    }
 	    else
-	      q_status_message(SM_ORDER, 0, 1, "Already on first message");
+	      q_status_message(SM_ORDER, 0, 1, "wgĤ@@ʰTF");
 	}
 
 	break;
@@@@ -316,7 +316,7 @@@@
 	   && (i = mn_get_cur(msgmap)) < mn_get_total(msgmap)){
 	    mn_inc_cur(stream, msgmap);
 	    if(i == mn_get_cur(msgmap))
-	      any_messages(NULL, "more", "in Zoomed Index");
+	      any_messages(NULL, "h", "biYޤ");
 	}
 	else{
 	    prompt[0] = '\0';
@@@@ -333,7 +333,7 @@@@
 		  strcat(prompt, ".  No more folders to TAB to.");
 	    }
 
-	    any_messages(NULL, (mn_get_total(msgmap) > 0L) ? "more" : NULL,
+	    any_messages(NULL, (mn_get_total(msgmap) > 0L) ? "h" : NULL,
 			 prompt[0] ? prompt : NULL);
 
 	    if(!IS_NEWS(stream))
@@@@ -511,9 +511,9 @@@@
 			    }
 			}
 			else
-			  q_status_message1(SM_ORDER, 0, 2, "No more %ss",
+			  q_status_message1(SM_ORDER, 0, 2, "Sh%sF",
 				     (state->context_current->use&CNTXT_INCMNG)
-				        ? "incoming folder" : "news group");
+				        ? "siƧX" : "sDոs");
 
 			break;
 		    }
@@@@ -530,9 +530,9 @@@@
 		     */
 		    if(F_OFF(F_AUTO_OPEN_NEXT_UNREAD, state)){
 			static ESCKEY_S next_opt[] = {
-			    {'y', 'y', "Y", "Yes"},
-			    {'n', 'n', "N", "No"},
-			    {TAB, 'n', "Tab", "NextNew"},
+			    {'y', 'y', "Y", "O"},
+			    {'n', 'n', "N", "_"},
+			    {TAB, 'n', "Tab", "U@@s"},
 			    {-1, 0, NULL, NULL}
 			};
 
@@@@ -558,7 +558,7 @@@@
 	    else
 	      any_messages(NULL,
 			   (mn_get_total(msgmap) > 0L)
-			     ? IS_NEWS(stream) ? "more undeleted" : "more new"
+			     ? IS_NEWS(stream) ? "hD_R" : "hs"
 			     : NULL,
 			   NULL);
 	}
@@@@ -576,7 +576,7 @@@@
 	 * global "zoom mode" flag to suppress messags from the index
 	 * should suffice.
 	 */
-	if(any_messages(msgmap, NULL, "to Zoom on")){
+	if(any_messages(msgmap, NULL, "iѩj")){
 	    if(unzoom_index(state, msgmap)){
 		dprint(4, (debugfile, "\n\n ---- Exiting ZOOM mode ----\n"));
 		q_status_message(SM_ORDER,0,2, "Index Zoom Mode is now off");
@@@@ -593,7 +593,7 @@@@
 		     "All messages selected, so not entering Index Zoom Mode");
 	    }
 	    else
-	      any_messages(NULL, "selected", "to Zoom on");
+	      any_messages(NULL, "Q襤", "iѩj");
 	}
 
 	break;
@@@@ -601,7 +601,7 @@@@
 
           /*---------- print message on paper ----------*/
       case MC_PRINTMSG :
-	if(any_messages(msgmap, NULL, "to print"))
+	if(any_messages(msgmap, NULL, "iѦCL"))
 	  cmd_print(state, msgmap, 0, in_index);
 
 	break;
@@@@ -609,7 +609,7 @@@@
 
           /*---------- Take Address ----------*/
       case MC_TAKE :
-	if(any_messages(msgmap, NULL, "to Take address from"))
+	if(any_messages(msgmap, NULL, "iѨoa}"))
 	  cmd_take_addr(state, msgmap, 0);
 
 	break;
@@@@ -617,7 +617,7 @@@@
 
           /*---------- Save Message ----------*/
       case MC_SAVE :
-	if(any_messages(msgmap, NULL, "to Save"))
+	if(any_messages(msgmap, NULL, "iѦs"))
 	  cmd_save(state, stream, msgmap, 0);
 
 	break;
@@@@ -625,7 +625,7 @@@@
 
           /*---------- Export message ----------*/
       case MC_EXPORT :
-	if(any_messages(msgmap, NULL, "to Export")){
+	if(any_messages(msgmap, NULL, "iѶץX")){
 	    cmd_export(state, msgmap, question_line, 0);
 	    state->mangled_footer = 1;
 	}
@@@@ -638,9 +638,9 @@@@
 	dprint(2, (debugfile, "\n - expunge -\n"));
 	if(IS_NEWS(stream) && stream->rdonly){
 	    if((del_count = count_flagged(stream, F_DEL)) > 0L){
-		state->mangled_footer = 1;
-		sprintf(prompt, "Exclude %ld message%s from %s", del_count,
-			plural(del_count), pretty_fn(state->cur_folder));
+
+		sprintf(prompt, " %s ư %ld ʫH",
+			pretty_fn(state->cur_folder), del_count);
 		if(F_ON(F_FULL_AUTO_EXPUNGE, state)
 		   || (F_ON(F_AUTO_EXPUNGE, state)
 		       && (state->context_current
@@@@ -662,21 +662,20 @@@@
 
 		    state->mangled_body = 1;
 		    state->mangled_header = 1;
-		    q_status_message2(SM_ORDER, 0, 4, "%s message%s excluded",
-				      long2string(del_count),
-				      plural(del_count));
+		    q_status_message1(SM_ORDER, 0, 4, "%s ʫHQưF",
+				      long2string(del_count));
 		}
 		else
-		  any_messages(NULL, NULL, "Excluded");
+		  any_messages(NULL, NULL, "ưb~");
 	    }
 	    else
-	      any_messages(NULL, "deleted", "to Exclude");
+	      any_messages(NULL, "QR", "iѱư");
 
 	    break;
 	}
 	else if(READONLY_FOLDER){
 	    q_status_message(SM_ORDER, 0, 4,
-			     "Can't expunge. Folder is read-only");
+			     "LkRCHXOŪ");
 	    break;
 	}
 
@@@@ -695,7 +694,7 @@@@
 	      ret = 'y';
 
 	    if(ret == 'x')
-	      cmd_cancelled("Expunge");
+	      cmd_cancelled("R");
 
 	    if(ret != 'y')
 	      break;
@@@@ -763,11 +762,11 @@@@
 	if(state->expunge_count <= 0)
 	  if(del_count)
 	    q_status_message1(SM_ORDER, 0, 3,
-			      "No messages expunged from folder \"%s\"",
+			      "SH۫HX \"%s\" R",
 			      pretty_fn(state->cur_folder));
 	  else
 	    q_status_message(SM_ORDER, 0, 3,
-			 "No messages marked deleted.  No messages expunged.");
+			 "SHQХܬRCSHQRC");
 
 	break;
 
@@@@ -799,8 +798,8 @@@@
 
 	    if(del_count > 0L){
 		state->mangled_footer = 1;
-		sprintf(prompt, "UNexclude %ld message%s in %s", del_count,
-			plural(del_count), pretty_fn(state->cur_folder));
+		sprintf(prompt, "%ld ʫHbHX %s Q_ư", del_count,
+			pretty_fn(state->cur_folder));
 		if(F_ON(F_FULL_AUTO_EXPUNGE, state)
 		   || (F_ON(F_AUTO_EXPUNGE, state)
 		       && (state->context_current
@@@@ -818,29 +817,28 @@@@
 		     */
 		    refresh_sort(msgmap, FALSE);
 		    state->mangled_header = 1;
-		    q_status_message2(SM_ORDER, 0, 4,
-				      "%s message%s UNexcluded",
-				      long2string(del_count),
-				      plural(del_count));
+		    q_status_message1(SM_ORDER, 0, 4,
+				      "%s ʫHQ_ư",
+				      long2string(del_count));
 
 		    if(!visible)	/* hilite last message */
 		      mn_set_cur(msgmap, mn_get_total(msgmap));
 		}
 		else
-		  any_messages(NULL, NULL, "UNexcluded");
+		  any_messages(NULL, NULL, "w_ư");
 	    }
 	    else
-	      any_messages(NULL, "excluded", "to UNexclude");
+	      any_messages(NULL, "wQư", "iѴ_ư");
 	}
 	else
-	  any_messages(NULL, "excluded", "to UNexclude");
+	  any_messages(NULL, "wQư", "iѴ_ư");
 
 	break;
 
 
           /*------- Make Selection -----------*/
       case MC_SELECT :
-	if(any_messages(msgmap, NULL, "to Select")){
+	if(any_messages(msgmap, NULL, "iѿ")){
 	    aggregate_select(state, msgmap, question_line, in_index);
 	    if(in_index && any_lflagged(msgmap, MN_SLCT) > 0L
 	       && !any_lflagged(msgmap, MN_HIDE)
@@@@ -872,7 +870,7 @@@@
 		  unzoom_index(state, msgmap);
 	    }
 	    else
-	      any_messages(NULL, NULL, "to Apply command to.  Try \"Select\"");
+	      any_messages(NULL, NULL, "iѮMΩROCո \"\"");
 	}
 
 	break;
@@@@ -950,21 +948,21 @@@@
 {
     if(cmd == ctrl('Q') || cmd == ctrl('S'))
       q_status_message1(SM_ASYNC, 0, 2,
- "%s char received.  Set \"preserve-start-stop\" feature in Setup/Config.",
+ " %s rCH ]w/ҳ]w } \"preserve-start-stop\"C",
 			pretty_command(cmd));
     else if(cmd == KEY_JUNK)
       q_status_message3(SM_ORDER, 0, 2,
-		      "Invalid key pressed.%s%s%s",
-		      (help) ? " Use " : "",
+		      "JFLĪC%s%s%s",
+		      (help) ? "ХH " : "",
 		      (help) ?  help   : "",
-		      (help) ? " for help" : "");
+		      (help) ? " IsU" : "");
     else
       q_status_message4(SM_ORDER, 0, 2,
-		      "Command \"%s\" not defined for this screen.%s%s%s",
+		      "RO \"%s\" bewqC%s%s%s",
 		      pretty_command(cmd),
-		      (help) ? " Use " : "",
+		      (help) ? "ХH " : "",
 		      (help) ?  help   : "",
-		      (help) ? " for help" : "");
+		      (help) ? " IsUC" : "");
 }
 
 
@@@@ -1237,11 +1235,9 @@@@
     char *type, *cmd;
 {
     if(mn_get_total(map) <= 0L){
-	q_status_message4(SM_ORDER, 0, 2, "No %s%smessages%s%s",
+	q_status_message2(SM_ORDER, 0, 2, "S%sH%s",
 			  type ? type : "",
-			  type ? " " : "",
-			  (!cmd || *cmd != '.') ? " " : "",
-			  cmd ? cmd : "in folder");
+			  cmd ? cmd : "bHX");
 	return(FALSE);
     }
 
@@@@ -1265,8 +1261,8 @@@@
 {
     if(READONLY_FOLDER || state->dead_stream){
 	q_status_message2(SM_ORDER | (state->dead_stream ? SM_DING : 0), 0, 3,
-			  "Can't %s message.  Folder is %s.", cmd,
-			  (state->dead_stream) ? "closed" : "read-only");
+			  "Lk%sHCHXO%sC", cmd,
+			  (state->dead_stream) ? "" : "Ū");
 	return(FALSE);
     }
 
@@@@ -1286,7 +1282,7 @@@@
 cmd_cancelled(cmd)
     char *cmd;
 {
-    q_status_message1(SM_INFO, 0, 2, "%s cancelled", cmd ? cmd : "Command");
+    q_status_message1(SM_INFO, 0, 2, "%s", cmd ? cmd : "RO");
 }
 
 
@@@@ -1312,7 +1308,7 @@@@
 
     dprint(4, (debugfile, "\n - delete message -\n"));
     if(!(any_messages(msgmap, NULL, "to Delete")
-	 && can_set_flag(state, "delete")))
+	 && can_set_flag(state, "R")))
       return;
 
     if(state->io_error_on_stream) {
@@@@ -1322,16 +1318,15 @@@@
 
     if(agg){
 	sequence = selected_sequence(state->mail_stream, msgmap, &del_count);
-	sprintf(prompt, "%ld selected message%s marked for deletion",
-		del_count, plural(del_count));
+	sprintf(prompt, "%ld ʫHQХܬݧR", del_count);
     }
     else{
 	msgno	  = mn_get_cur(msgmap);
 	del_count = 1L;				/* return current */
 	sequence  = cpystr(long2string(mn_m2raw(msgmap, mn_get_cur(msgmap))));
 	lastmsg	  = (msgno >= mn_get_total(msgmap));
-	sprintf(prompt, "%s%s marked for deletion",
-		lastmsg ? "Last message" : "Message ",
+	sprintf(prompt, "%s%s QХܬݧR",
+		lastmsg ? "̫@@ʫH" : "H ",
 		lastmsg ? "" : long2string(msgno));
     }
 
@@@@ -1361,8 +1356,8 @@@@
 	    strcpy(nextfolder, state->cur_folder);
 	    strcat(prompt, next_folder(NULL, nextfolder, nextfolder,
 				       state->context_current, NULL)
-			      ? ".  Press TAB for next folder."
-			      : ".  No more folders to TAB to.");
+			      ? "C H TAB ܤU@@HXC"
+			      : "C wLhHXiѤFC");
 	}
     }
 
@@@@ -1393,7 +1388,7 @@@@
 
     dprint(4, (debugfile, "\n - undelete -\n"));
     if(!(any_messages(msgmap, NULL, "to Undelete")
-	 && can_set_flag(state, "undelete")))
+	 && can_set_flag(state, "_R")))
       return;
 
     if(agg){
@@@@ -1418,13 +1413,13 @@@@
 	update_titlebar_status();
 	q_status_message(SM_ORDER, 0, 3,
 			wasdeleted
-			 ? "Deletion mark removed, message won't be deleted"
-			 : "Message not marked for deletion; no action taken");
+			 ? "wRаOAHN|DR"
+			 : "H|QХܬRGSĨ");
     }
     else
-      q_status_message2(SM_ORDER, 0, 3,
-			"Deletion mark removed from %s message%s",
-			comatose(del_count), plural(del_count));
+      q_status_message1(SM_ORDER, 0, 3,
+			" %s ʫHWRаO",
+			comatose(del_count));
 
     if(state->io_error_on_stream) {
 	state->io_error_on_stream = 0;
@@@@ -1488,7 +1483,7 @@@@
     };
 
     if(!(any_messages(msgmap, NULL, "to Flag")
-	 && can_set_flag(state, "flag")))
+	 && can_set_flag(state, "Х")))
       return;
 
     if(state->io_error_on_stream) {
@@@@ -1844,7 +1839,7 @@@@
     if(msgno_any_deletedparts(stream, msgmap)
        && want_to("Saved copy will NOT include entire message!  Continue",
 		  'y', 'n', NO_HELP, WT_FLUSH_IN | WT_SEQ_SENSITIVE) != 'y'){
-	cmd_cancelled("Save message");
+	cmd_cancelled("Hs");
 	return;
     }
 
@@@@ -1967,32 +1962,32 @@@@
     ekey[rc].ch      = ctrl('T');
     ekey[rc].rval    = 2;
     ekey[rc].name    = "^T";
-    ekey[rc++].label = "To Fldrs";
+    ekey[rc++].label = "HXC";
 
     if(saveable_count > 1){
 	ekey[rc].ch      = ctrl('P');
 	ekey[rc].rval    = 10;
 	ekey[rc].name    = "^P";
-	ekey[rc++].label = "Prev Collection";
+	ekey[rc++].label = "e@@`";
 
 	ekey[rc].ch      = ctrl('N');
 	ekey[rc].rval    = 11;
 	ekey[rc].name    = "^N";
-	ekey[rc++].label = "Next Collection";
+	ekey[rc++].label = "@@`";
     }
 
     if(F_ON(F_ENABLE_TAB_COMPLETE, ps_global)){
 	ekey[rc].ch      = TAB;
 	ekey[rc].rval    = 12;
 	ekey[rc].name    = "TAB";
-	ekey[rc++].label = "Complete";
+	ekey[rc++].label = "";
     }
 
     if(F_ON(F_ENABLE_SUB_LISTS, ps_global)){
 	ekey[rc].ch      = ctrl('X');
 	ekey[rc].rval    = 14;
 	ekey[rc].name    = "^X";
-	ekey[rc++].label = "ListMatches";
+	ekey[rc++].label = "CXŦX";
     }
 
     if(saveable_count > 1){
@@@@ -2129,7 +2124,7 @@@@
 	    /* else fall thru like they cancelled */
 
 	  case 1 :
-	    cmd_cancelled("Save message");
+	    cmd_cancelled("Hs");
 	    done--;
 	    break;
 
@@@@ -3260,16 +3255,16 @@@@
 	}
 
 	sprintf(tmp_20k_buf,
-		"Folder \"%.15s%s\" in <%.15s%s> doesn't exist. Create",
+		"HX \"%.15s%s\" b <%.15s%s> sbCnإ",
 		folder, (strlen(folder) > 15) ? "..." : "",
 		context->nickname,
 		(strlen(context->nickname) > 15) ? "..." : "");
     }
     else
-      sprintf(tmp_20k_buf,"Folder \"%.40s\" doesn't exist.  Create", folder);
+      sprintf(tmp_20k_buf,"HX \"%.40s\" sbCnإ", folder);
 
     if(want_to(tmp_20k_buf, 'y', 'n', NO_HELP, WT_SEQ_SENSITIVE) != 'y'){
-	cmd_cancelled("Save message");
+	cmd_cancelled("Hs");
 	return(-1);
     }
 
@@@@ -3395,14 +3390,14 @@@@
     export_opts[i = 0].ch  = ctrl('T');
     export_opts[i].rval	   = 10;
     export_opts[i].name	   = "^T";
-    export_opts[i++].label = "To Files";
+    export_opts[i++].label = "ɮצC";
 
 #if	!defined(DOS) && !defined(MAC) && !defined(OS2)
     if(ps_global->VAR_DOWNLOAD_CMD && ps_global->VAR_DOWNLOAD_CMD[0]){
 	export_opts[i].ch      = ctrl('V');
 	export_opts[i].rval    = 12;
 	export_opts[i].name    = "^V";
-	export_opts[i++].label = "Downld Msg";
+	export_opts[i++].label = "U";
     }
 #endif	/* !(DOS || MAC) */
 
@@@@ -3410,7 +3405,7 @@@@
 	export_opts[i].ch      =  ctrl('I');
 	export_opts[i].rval    = 11;
 	export_opts[i].name    = "TAB";
-	export_opts[i++].label = "Complete";
+	export_opts[i++].label = "";
     }
 
 #if	0
@@@@ -3419,7 +3414,7 @@@@
 	export_opts[i].ch      = ctrl('X');
 	export_opts[i].rval    = 14;
 	export_opts[i].name    = "^X";
-	export_opts[i++].label = "ListMatches";
+	export_opts[i++].label = "CXŦX";
     }
 #endif
 
@@@@ -3433,7 +3428,7 @@@@
     if(r < 0){
 	switch(r){
 	  case -1:
-	    cmd_cancelled("Export message");
+	    cmd_cancelled("ץXH");
 	    break;
 
 	  case -2:
@@@@ -3455,7 +3450,7 @@@@
 
 	if(ps_global->restricted){
 	    q_status_message(SM_ORDER | SM_DING, 3, 3,
-			     "Download disallowed in restricted mode");
+			     "Ҧ\\U");
 	    goto fini;
 	}
 
@@@@ -3474,7 +3469,7 @@@@
 		 || !format_message(mn_m2raw(msgmap, mn_get_cur(msgmap)),
 				    env, b, FM_NEW_MESS | FM_NOWRAP, pc)){
 		  q_status_message(SM_ORDER | SM_DING, 3, 3,
-			   err = "Error writing tempfile for download");
+			   err = "gJUȦsɮɵoͿ~");
 		  break;
 	      }
 
@@@@ -3487,18 +3482,18 @@@@
 		  (void) close_system_pipe(&syspipe);
 		else
 		  q_status_message(SM_ORDER | SM_DING, 3, 3,
-				err = "Error running download command");
+				err = "UROɵoͿ~");
 	    }
 
 	    unlink(tfp);
 	}
 	else
 	  q_status_message(SM_ORDER | SM_DING, 3, 3,
-			 err = "Error building temp file for download");
+			 err = "LkإߨѤUϥΪȦs");
 
 	fs_give((void **)&tfp);
 	if(!err)
-	  q_status_message(SM_ORDER, 0, 3, "Download Command Completed");
+	  q_status_message(SM_ORDER, 0, 3, "URO");
 
 	goto fini;
     }
@@@@ -3612,7 +3607,7 @@@@
     STORE_S *store = NULL;
     struct variable *vars = ps->vars;
     static ESCKEY_S simple_export_opts[] = {
-	{ctrl('T'), 10, "^T", "To Files"},
+	{ctrl('T'), 10, "^T", "ɮצC"},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL}};
 
@@@@ -3620,7 +3615,7 @@@@
 	simple_export_opts[r].ch    =  ctrl('I');
 	simple_export_opts[r].rval  = 11;
 	simple_export_opts[r].name  = "TAB";
-	simple_export_opts[r].label = "Complete";
+	simple_export_opts[r].label = "";
     }
 
     if(!srctext){
@@@@ -3693,7 +3688,7 @@@@
 	break;
 
       case -1:
-	cmd_cancelled("Export");
+	cmd_cancelled("ץX");
 	break;
 
       case -2:
@@@@ -4365,32 +4360,32 @@@@
     ekey[rc].ch	     = (allow_list) ? ctrl('T') : 0 ;
     ekey[rc].rval    = (allow_list) ? 2 : 0;
     ekey[rc].name    = (allow_list) ? "^T" : "";
-    ekey[rc++].label = (allow_list) ? "ToFldrs" : "";
+    ekey[rc++].label = (allow_list) ? "ɮצC" : "";
 
     if(ps_global->context_list->next){
 	ekey[rc].ch      = ctrl('P');
 	ekey[rc].rval    = 10;
 	ekey[rc].name    = "^P";
-	ekey[rc++].label = "Prev Collection";
+	ekey[rc++].label = "e@@`";
 
 	ekey[rc].ch      = ctrl('N');
 	ekey[rc].rval    = 11;
 	ekey[rc].name    = "^N";
-	ekey[rc++].label = "Next Collection";
+	ekey[rc++].label = "@@`";
     }
 
     if(F_ON(F_ENABLE_TAB_COMPLETE,ps_global)){
 	ekey[rc].ch      = TAB;
 	ekey[rc].rval    = 12;
 	ekey[rc].name    = "TAB";
-	ekey[rc++].label = "Complete";
+	ekey[rc++].label = "";
     }
 
     if(F_ON(F_ENABLE_SUB_LISTS, ps_global)){
 	ekey[rc].ch      = ctrl('X');
 	ekey[rc].rval    = 14;
 	ekey[rc].name    = "^X";
-	ekey[rc++].label = "ListMatches";
+	ekey[rc++].label = "CXŦX";
     }
 
     if(ps_global->context_list->next){
@@@@ -4508,15 +4503,15 @@@@
 				    newfolder);
 		else if(tc->use & CNTXT_INCMNG)
 		  q_status_message1(SM_ORDER, 0, 3,
-				    "Can't find Incoming Folder: %s",
+				    "䤣siHXG%s",
 				    newfolder);
 		else if(context_isambig(newfolder))
 		  q_status_message3(SM_ORDER, 0, 3,
-				    "Can't find folder \"%s\" in %.*s",
-				    newfolder, (void *) 50, tc->nickname);
+				    "b %.*s 䤣HX \"%s\"",
+				    (void *) 50, tc->nickname, newfolder);
 		else
 		  q_status_message1(SM_ORDER, 0, 3,
-				    "Can't find folder \"%s\"",
+				    "䤣HX \"%s\"",
 				    newfolder);
 
 		return(NULL);
@@@@ -4529,7 +4524,7 @@@@
 	    /* fall thru like they cancelled */
 
 	  case 1 :				/* o_e says user cancel */
-	    cmd_cancelled("Open folder");
+	    cmd_cancelled("}ҫHX");
 	    return(NULL);
 
 	  case 2 :				/* o_e says user wants list */
@@@@ -4762,7 +4757,7 @@@@
 	else if ((new_context->use & CNTXT_INCMNG)
 		 && (folder_index(newfolder, new_context, FI_FOLDER) < 0)){
 	    q_status_message1(SM_ORDER, 3, 4,
-			    "Can't find Incoming Folder %s.", newfolder);
+			    "䤣siHX %sC", newfolder);
 	    return(0);
 	}
     }
@@@@ -4802,11 +4797,10 @@@@
 	clear_index_cache();
         /* MUST sort before restoring msgno! */
 	refresh_sort(ps_global->msgmap, FALSE);
-        q_status_message3(SM_ORDER, 0, 3,
-			  "Opened folder \"%s\" with %s message%s",
+        q_status_message2(SM_ORDER, 0, 3,
+			  "HX \"%s\" w}ҡA@@ %s ʫH",
 			  ps_global->inbox_name, 
-                          long2string(mn_get_total(ps_global->msgmap)),
-			  plural(mn_get_total(ps_global->msgmap)));
+                          long2string(mn_get_total(ps_global->msgmap)));
 #ifdef	_WINDOWS
 	mswin_settitle(ps_global->inbox_name);
 #endif
@@@@ -4846,7 +4840,7 @@@@
 	}
     }
 
-    strcat(strncat(strcpy(status_msg, "Opening \""),
+    strcat(strncat(strcpy(status_msg, "b} \""),
 	    pretty_fn(newfolder), 70), "\"");
     we_cancel = busy_alarm(1, status_msg, NULL, 1);
 
@@@@ -4930,7 +4924,7 @@@@
 			 && !mn_get_revsort(ps_global->msgmap)))
 		      refresh_sort(ps_global->msgmap, FALSE);
 
-                    q_status_message1(SM_ORDER, 0, 3, "Folder \"%s\" reopened",
+                    q_status_message1(SM_ORDER, 0, 3, "s}ҸƧX \"%s\"",
                                       old_folder);
                 }
             }
@@@@ -5018,14 +5012,13 @@@@
 
     /* UWIN doesn't want to see this message */
     if(!ps_global->nr_mode)
-      q_status_message7(SM_ORDER, 0, 4, "%s \"%s\" opened with %s message%s%s",
+      q_status_message7(SM_ORDER, 0, 4, "%s \"%s\" w}ҡA@@ %s ʫH",
 			IS_NEWS(ps_global->mail_stream)
-			  ? "News group" : "Folder",
+			  ? "sDոs" : "HX",
 			pretty_fn(newfolder),
 			comatose(mn_get_total(ps_global->msgmap)),
-			plural(mn_get_total(ps_global->msgmap)),
-			READONLY_FOLDER ? " READONLY" : "",
-			NULL, NULL);
+			READONLY_FOLDER ? " Ū" : "",
+			NULL, NULL, NULL);
 
 #ifdef	_WINDOWS
     mswin_settitle(pretty_fn(newfolder));
@@@@ -5191,9 +5184,9 @@@@
     char ing[4];
 
     if(final_msg)
-      strcpy(ing, "ed");
+      strcpy(ing, "w");
     else
-      strcpy(ing, "ing");
+      strcpy(ing, "");
 
     buff1[0] = '\0';
     buff2[0] = '\0';
@@@@ -5202,7 +5195,7 @@@@
                    stream->mailbox));
         if(!stream->rdonly){
 
-            q_status_message1(SM_INFO, 0, 1, "Closing \"%s\"...", folder);
+            q_status_message1(SM_INFO, 0, 1, "b \"%s\"...", folder);
 	    flush_status_messages(1);
 
 	    /*
@@@@ -5255,10 +5248,8 @@@@
 		}
 		else{
 		    sprintf(prompt_b,
-			    "Expunge the %ld deleted message%s from \"%s\"",
-			    delete_count,
-			    delete_count == 1 ? "" : "s",
-			    short_folder_name);
+			    " \"%s\" R %ld ʫH", short_folder_name,
+			    delete_count);
 		    ret = want_to(prompt_b, 'y', 0, NO_HELP, WT_NORM);
 		}
 
@@@@ -5269,13 +5260,10 @@@@
 
 		if(ret == 'y'){
 		    sprintf(buff2,
-		      "Clos%s \"%.30s\". %s %s message%s and delet%s %s.",
+		      "%s \"%.30s\"COd %s ʨçR %s ʫHC",
 			ing,
 	 		pretty_fn(folder),
-			final_msg ? "Kept" : "Keeping",
 			comatose((stream->nmsgs - delete_count)),
-			plural(stream->nmsgs - delete_count),
-			ing,
 			long2string(delete_count));
 		    if(final_msg)
 		      *final_msg = cpystr(buff2);
@@@@ -5348,17 +5336,15 @@@@
 
 		if(stream->nmsgs){
 		    sprintf(buff2,
-		        "Clos%s folder \"%s\". %s%s%s message%s.",
+		        "%sHX \"%s\"COd%s%s ʫHC",
 			ing,
 			pretty_fn(folder), 
-			final_msg ? "Kept" : "Keeping",
-			(stream->nmsgs == 1L) ? " single" : " all ",
+			(stream->nmsgs == 1L) ? " @@" : "@@ ",
 			(stream->nmsgs > 1L)
-			  ? comatose(stream->nmsgs) : "",
-			plural(stream->nmsgs));
+			  ? comatose(stream->nmsgs) : "");
 		}
 		else{
-		    sprintf(buff2, "Clos%s empty folder \"%s\"",
+		    sprintf(buff2, "%sŪHX \"%s\"",
 			ing, pretty_fn(folder));
 		}
 
@@@@ -5377,7 +5363,7 @@@@
 		  q_status_message(SM_ORDER,
 		      F_ON(F_AUTO_READ_MSGS,ps_global) ? 0 : 3, 5, moved_msg);
 
-		sprintf(buff2, "Clos%s news group \"%s\"",
+		sprintf(buff2, "%ssDոs \"%s\"",
 			ing, pretty_fn(folder));
 
 		if(F_ON(F_NEWS_CATCHUP, ps_global)){
@@@@ -5414,7 +5400,7 @@@@
 	    }
             else
 	      sprintf(buff2,
-			"Clos%s read-only folder \"%s\". No changes to save",
+			"%sŪHX \"%s\"CsJ",
 			ing, pretty_fn(folder));
 
 	    if(final_msg)
@@@@ -6093,18 +6079,18 @@@@
     if(in_index && F_ON(F_PRINT_INDEX, state)){
 	char m[10];
 	static ESCKEY_S prt_opts[] = {
-	    {'i', 'i', "I", "Index"},
+	    {'i', 'i', "I", ""},
 	    {'m', 'm', "M", NULL},
 	    {-1, 0, NULL, NULL}};
 
-	sprintf(m, "Message%s", (msgs>1L) ? "s" : "");
+	sprintf(m, "H");
 	prt_opts[1].label = m;
-	sprintf(prompt, "Print %sFolder Index or %s %s? ",
-	    agg ? "selected " : "", agg ? "selected" : "current", m);
+	sprintf(prompt, "LX %sHXީ %s %s? ",
+	    agg ? "wQܪ " : "", agg ? "wQܪ" : "ثe", m);
 	switch(radio_buttons(prompt, -FOOTER_ROWS(state), prt_opts, 'm', 'x',
 			     NO_HELP, RB_NORM|RB_SEQ_SENSITIVE)){
 	  case 'x' :
-	    cmd_cancelled("Print");
+	    cmd_cancelled("CL");
 	    if(agg)
 	      restore_selected(msgmap);
 
@@@@ -6121,11 +6107,11 @@@@
     }
 
     if(do_index)
-      sprintf(prompt, "%sFolder Index ", agg ? "Selected " : "");
+      sprintf(prompt, "%sHX ", agg ? "wQܪ" : "");
     else if(msgs > 1L)
-      sprintf(prompt, "%s messages ", long2string(msgs));
+      sprintf(prompt, "%s ʫH ", long2string(msgs));
     else
-      sprintf(prompt, "Message %s ", long2string(mn_get_cur(msgmap)));
+      sprintf(prompt, " %s ʫH", long2string(mn_get_cur(msgmap)));
 
     if(open_printer(prompt) < 0){
 	if(agg)
@@@@ -6389,7 +6375,7 @@@@
 	    /* else fall thru as if cancelled */
 
 	  case 1 :
-	    cmd_cancelled("Pipe command");
+	    cmd_cancelled("ɦV(Pipe)RO");
 	    done++;
 	    break;
 
@@@@ -6725,7 +6711,7 @@@@
     sel_opts = sel_opts2;
     if(old_tot = any_lflagged(msgmap, MN_SLCT)){
 	i = get_lflag(state->mail_stream, msgmap, mn_get_cur(msgmap), MN_SLCT);
-	sel_opts1[1].label = "unselect Cur" + (i ? 0 : 2);
+	sel_opts1[1].label = "ثe" + (i ? 0 : 2);
 	sel_opts += 2;			/* disable extra options */
 	switch(q = radio_buttons(sel_pmt1, q_line, sel_opts1, 'c', 'x', help,
 				 RB_NORM)){
@@@@ -6769,7 +6755,7 @@@@
      */
     switch(q){
       case 'x':				/* cancel */
-	cmd_cancelled("Select command");
+	cmd_cancelled("RO");
 	return;
 
       case 'c' :			/* select/unselect current */
@@@@ -6978,14 +6964,14 @@@@
 	sel_opts3[i].ch      = '*';
 	sel_opts3[i].rval    = '*';
 	sel_opts3[i].name    = "*";
-	sel_opts3[i++].label = "Flag";
+	sel_opts3[i++].label = "X";
     }
 
     if(F_ON(F_ENABLE_PIPE,state)){ /* pipe? */
 	sel_opts3[i].ch      = '|';
 	sel_opts3[i].rval    = '|';
 	sel_opts3[i].name    = "|";
-	sel_opts3[i++].label = "Pipe";
+	sel_opts3[i++].label = "ɦV(Pipe)";
     }
 
     /*
@@@@ -6997,7 +6983,7 @@@@
 	sel_opts3[i].ch      = 'b';
 	sel_opts3[i].rval    = 'b';
 	sel_opts3[i].name    = "B";
-	sel_opts3[i++].label = "Bounce";
+	sel_opts3[i++].label = "hH";
     }
 
     if(F_ON(F_ENABLE_PRYNT, state)){
@@@@ -7068,7 +7054,7 @@@@
 	break;
 
       case 'x' :			/* cancel */
-	cmd_cancelled("Apply command");
+	cmd_cancelled("MΩRO");
 	rv = 0;
 	break;
 
@@@@ -7185,7 +7171,7 @@@@
 	*t = '\0';
 
         if(r == 1 || numbers[0] == '\0'){
-	    cmd_cancelled("Selection by number");
+	    cmd_cancelled("ھڼƦr");
 	    return(1);
         }
 	else
@@@@ -7311,7 +7297,7 @@@@
 			     prompt, sel_date_opt, help, &flags);
 	switch (r){
 	  case 1 :
-	    cmd_cancelled("Selection by date");
+	    cmd_cancelled("ھڤ");
 	    return(1);
 
 	  case 3 :
@@@@ -7433,15 +7419,15 @@@@
 	ekey[0].ch    = ctrl('T');
 	ekey[0].name  = "^T";
 	ekey[0].rval  = 10;
-	ekey[0].label = "Cur To";
+	ekey[0].label = "ثeHH";
 	ekey[1].ch    = ctrl('R');
 	ekey[1].name  = "^R";
 	ekey[1].rval  = 11;
-	ekey[1].label = "Cur From";
+	ekey[1].label = "ثeHH";
 	ekey[2].ch    = ctrl('W');
 	ekey[2].name  = "^W";
 	ekey[2].rval  = 12;
-	ekey[2].label = "Cur Cc";
+	ekey[2].label = "ثeƥ";
 	break;
 
       case 's' :
@@@@ -7449,7 +7435,7 @@@@
 	ekey[0].ch    = ctrl('X');
 	ekey[0].name  = "^X";
 	ekey[0].rval  = 13;
-	ekey[0].label = "Cur Subject";
+	ekey[0].label = "ثeDD";
 	break;
 
       case 'a' :
@@@@ -7560,7 +7546,7 @@@@
     }
 
     if(type == 'x' || r == 'x'){
-	cmd_cancelled("Selection by text");
+	cmd_cancelled("ھڤr");
 	return(1);
     }
 
@@@@ -7818,7 +7804,7 @@@@
 			  NO_HELP, RB_NORM);
 			  
 	if(s == 'x'){
-	    cmd_cancelled("Selection by status");
+	    cmd_cancelled("ھڪA");
 	    return(1);
 	}
 	else if(s == '!')
@@@@ -7915,7 +7901,7 @@@@
 
     /*----- String together the prompt ------*/
     tmp[1] = '\0';
-    strcpy(prompt, "Choose type of sort, or Reverse current sort : ");
+    strcpy(prompt, "ƧǤ覡AΤثeƧǡG");
     for(i = 0; state->sort_types[i] != EndofList; i++) {
 	sorts[i].rval	   = i;
 	p = sorts[i].label = sort_name(state->sort_types[i]);
@@@@ -7932,7 +7918,7 @@@@
     sorts[i].ch     = 'r';
     sorts[i].rval   = 'r';
     sorts[i].name   = cpystr("R");
-    sorts[i].label  = "Reverse";
+    sorts[i].label  = "";
     sorts[++i].ch   = -1;
     help = h_select_sort;
 
@@@@ -7945,7 +7931,7 @@@@
     }
     else{
 	retval = 0;
-	cmd_cancelled("Sort");
+	cmd_cancelled("Ƨ");
     }
 
     while(--i >= 0)
@


1.8
log
@Update to version 4.21.

PR:		14994
Submitted by:	maintainer
@
text
@@


1.7
log
@Update to version 4.20.

PR:		14575
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pine/mailcmd.c.orig	Tue Oct 12 06:13:50 1999
+++ pine/mailcmd.c	Thu Oct 14 13:29:28 1999
d532 1
a532 1
     if(msgno_any_exceptions(stream, msgmap, MSG_EX_DELETE)
d827 1
a827 1
@@@@ -5018,13 +5012,13 @@@@
d832 1
a832 1
+      q_status_message7(SM_ORDER, 0, 4, "%s \"%s\" w}ҡA@@ %s ʫH%s",
d838 1
a838 1
 			plural(mn_get_total(ps_global->msgmap)),
d840 1
d842 1
a842 1
 			NULL, NULL);
d845 2
a846 1
@@@@ -5191,9 +5185,9 @@@@
d858 1
a858 1
@@@@ -5202,7 +5196,7 @@@@
d867 1
a867 1
@@@@ -5255,10 +5249,8 @@@@
d880 1
a880 1
@@@@ -5269,13 +5261,10 @@@@
d895 1
a895 1
@@@@ -5348,17 +5337,15 @@@@
d917 1
a917 1
@@@@ -5377,7 +5364,7 @@@@
d926 1
a926 1
@@@@ -5414,7 +5401,7 @@@@
d935 1
a935 1
@@@@ -6033,18 +6020,18 @@@@
d959 1
a959 1
@@@@ -6061,11 +6048,11 @@@@
d974 1
a974 1
@@@@ -6329,7 +6316,7 @@@@
d983 1
a983 1
@@@@ -6642,7 +6629,7 @@@@
d992 1
a992 1
@@@@ -6686,7 +6673,7 @@@@
d1001 1
a1001 1
@@@@ -6895,14 +6882,14 @@@@
d1018 1
a1018 1
@@@@ -6914,7 +6901,7 @@@@
d1027 1
a1027 1
@@@@ -6985,7 +6972,7 @@@@
d1036 1
a1036 1
@@@@ -7102,7 +7089,7 @@@@
d1045 1
a1045 1
@@@@ -7228,7 +7215,7 @@@@
d1054 1
a1054 1
@@@@ -7350,15 +7337,15 @@@@
d1073 1
a1073 1
@@@@ -7366,7 +7353,7 @@@@
d1082 1
a1082 1
@@@@ -7477,7 +7464,7 @@@@
d1091 1
a1091 1
@@@@ -7735,7 +7722,7 @@@@
d1100 1
a1100 1
@@@@ -7832,7 +7819,7 @@@@
d1109 1
a1109 1
@@@@ -7849,7 +7836,7 @@@@
d1118 1
a1118 1
@@@@ -7862,7 +7849,7 @@@@
@


1.6
log
@Update to version 4.10.

PR:		10245
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/mailcmd.c.orig	Thu Feb  4 10:16:45 1999
+++ pine/mailcmd.c	Wed Feb 24 21:29:19 1999
@@@@ -109,39 +109,39 @@@@
d64 1
a64 1
@@@@ -151,24 +151,24 @@@@
d99 2
a100 1
@@@@ -178,18 +178,18 @@@@
a102 1
 #ifdef	RECIPIENT
d105 3
a107 4
 #else	/* RECIPIENT */
-    "Select based on To, From, Cc, Subject fields or All message text ? ";
+    "ܥH HAHHAƥADD 쬰DAΩҦTrH";
 #endif	/* RECIPIENT */
d114 3
d122 1
a122 2
 #ifdef	RECIPIENT
-    {'r', 'r', "R", "Recipient"},
d124 1
a124 1
 #endif	/* RECIPIENT */
d127 8
a134 1
@@@@ -243,7 +243,7 @@@@
d143 1
a143 1
@@@@ -272,7 +272,7 @@@@
d152 1
a152 1
@@@@ -296,10 +296,10 @@@@
d165 1
a165 1
@@@@ -311,7 +311,7 @@@@
d174 1
a174 1
@@@@ -328,7 +328,7 @@@@
d183 1
a183 1
@@@@ -475,9 +475,9 @@@@
d195 1
a195 1
@@@@ -494,9 +494,9 @@@@
d208 1
a208 1
@@@@ -522,7 +522,7 @@@@
d217 1
a217 1
@@@@ -540,7 +540,7 @@@@
d226 2
a227 2
@@@@ -552,7 +552,7 @@@@
 				  comatose(i), plural(i));
d235 1
a235 1
@@@@ -560,7 +560,7 @@@@
d244 1
a244 1
@@@@ -568,7 +568,7 @@@@
d253 1
a253 1
@@@@ -576,7 +576,7 @@@@
d259 1
a259 1
 	  cmd_save(state, msgmap, 0);
d262 1
a262 1
@@@@ -584,7 +584,7 @@@@
d271 1
a271 1
@@@@ -597,9 +597,9 @@@@
d284 1
a284 1
@@@@ -621,21 +621,20 @@@@
d311 1
a311 1
@@@@ -654,7 +653,7 @@@@
d320 1
a320 1
@@@@ -706,11 +705,11 @@@@
d334 12
a345 1
@@@@ -744,16 +743,15 @@@@
d356 3
d362 1
a362 1
+		  any_messages(NULL, NULL, "_ư");
d366 1
a366 1
+	      any_messages(NULL, "Qư", "iѴ_ư");
d368 3
d373 1
a373 1
@@@@ -761,7 +759,7 @@@@
d382 1
a382 1
@@@@ -793,7 +791,7 @@@@
d391 1
a391 1
@@@@ -871,21 +869,21 @@@@
d420 1
a420 1
@@@@ -1158,11 +1156,9 @@@@
d434 1
a434 1
@@@@ -1186,8 +1182,8 @@@@
d445 1
a445 1
@@@@ -1207,7 +1203,7 @@@@
d454 1
a454 1
@@@@ -1233,7 +1229,7 @@@@
d463 1
a463 1
@@@@ -1243,16 +1239,15 @@@@
d483 12
a494 1
@@@@ -1312,7 +1307,7 @@@@
d503 1
a503 2
@@@@ -1332,12 +1327,12 @@@@
     if(del_count == 1L){
d506 5
a510 2
-			 "Deletion mark removed, message won't be deleted");
+			 "HRаOAHN|DR");
d522 1
a522 1
@@@@ -1401,7 +1396,7 @@@@
d531 2
a532 2
@@@@ -1756,7 +1751,7 @@@@
     if(msgno_any_exceptions(state->mail_stream, msgmap)
d540 1
a540 1
@@@@ -1879,32 +1874,32 @@@@
d578 1
a578 1
@@@@ -2042,7 +2037,7 @@@@
d587 1
a587 1
@@@@ -3172,16 +3167,16 @@@@
d607 1
a607 1
@@@@ -3305,14 +3300,14 @@@@
d624 1
a624 1
@@@@ -3320,7 +3315,7 @@@@
d633 1
a633 1
@@@@ -3329,7 +3324,7 @@@@
d642 1
a642 1
@@@@ -3343,7 +3338,7 @@@@
d651 1
a651 1
@@@@ -3365,7 +3360,7 @@@@
d660 1
a660 1
@@@@ -3384,7 +3379,7 @@@@
d669 1
a669 1
@@@@ -3397,18 +3392,18 @@@@
d691 1
a691 1
@@@@ -3522,7 +3517,7 @@@@
d700 1
a700 1
@@@@ -3530,7 +3525,7 @@@@
d709 1
a709 1
@@@@ -3603,7 +3598,7 @@@@
d718 1
a718 1
@@@@ -4192,32 +4187,32 @@@@
d756 1
a756 1
@@@@ -4335,15 +4330,15 @@@@
d776 1
a776 1
@@@@ -4356,7 +4351,7 @@@@
d785 1
a785 1
@@@@ -4592,7 +4587,7 @@@@
d794 1
a794 1
@@@@ -4632,11 +4627,10 @@@@
d806 4
a809 4
 	return(1);
     }
 
@@@@ -4673,7 +4667,7 @@@@
d818 1
a818 1
@@@@ -4756,7 +4750,7 @@@@
d827 1
a827 1
@@@@ -4837,14 +4831,13 @@@@
d838 7
a844 9
-			plural(mn_get_total(ps_global->msgmap)),
-			READONLY_FOLDER ?" READONLY" : "",
-			NULL, NULL);
+			READONLY_FOLDER ?" Ū" : "",
+			NULL, NULL, NULL);
 
     sort_folder(ps_global->msgmap, ps_global->def_sort,
 		ps_global->def_sort_rev, TRUE);
@@@@ -5010,9 +5003,9 @@@@
d856 1
a856 1
@@@@ -5021,7 +5014,7 @@@@
d864 2
a865 2
 	    /* Save read messages? */
@@@@ -5061,10 +5054,8 @@@@
d878 1
a878 1
@@@@ -5075,13 +5066,10 @@@@
d893 2
a894 2
@@@@ -5107,17 +5095,15 @@@@
 	    if(ret != 'y'){
d915 1
a915 1
@@@@ -5136,7 +5122,7 @@@@
d923 2
a924 2
 		if(F_ON(F_NEWS_CROSS_DELETE, ps_global))
@@@@ -5144,7 +5130,7 @@@@
d933 1
a933 1
@@@@ -5444,18 +5430,18 @@@@
d957 1
a957 1
@@@@ -5472,11 +5458,11 @@@@
d972 1
a972 1
@@@@ -5740,7 +5726,7 @@@@
d981 1
a981 1
@@@@ -5823,7 +5809,7 @@@@
d990 1
a990 1
@@@@ -5867,7 +5853,7 @@@@
d999 1
a999 1
@@@@ -6075,14 +6061,14 @@@@
d1016 1
a1016 1
@@@@ -6094,7 +6080,7 @@@@
d1025 1
a1025 1
@@@@ -6165,7 +6151,7 @@@@
d1034 1
a1034 1
@@@@ -6282,7 +6268,7 @@@@
d1043 1
a1043 1
@@@@ -6408,7 +6394,7 @@@@
d1052 1
a1052 1
@@@@ -6518,15 +6504,15 @@@@
d1071 1
a1071 1
@@@@ -6534,7 +6520,7 @@@@
d1080 1
a1080 1
@@@@ -6633,7 +6619,7 @@@@
d1089 1
a1089 1
@@@@ -6814,7 +6800,7 @@@@
d1098 1
a1098 1
@@@@ -6911,7 +6897,7 @@@@
d1104 1
a1104 1
     for(i = 0; state->sort_types[i] != EndofList && i < 8; i++) {
d1107 1
a1107 1
@@@@ -6928,7 +6914,7 @@@@
d1116 1
a1116 1
@@@@ -6941,7 +6927,7 @@@@
@


1.5
log
@Update to version 4.05.

PR:		8025
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/mailcmd.c.orig	Tue Sep 15 03:01:15 1998
+++ pine/mailcmd.c	Tue Sep 22 19:13:41 1998
@@@@ -108,39 +108,39 @@@@
d64 1
a64 1
@@@@ -150,24 +150,24 @@@@
d99 1
a99 1
@@@@ -177,18 +177,18 @@@@
d126 1
a126 1
@@@@ -242,7 +242,7 @@@@
d135 1
a135 1
@@@@ -271,7 +271,7 @@@@
d144 1
a144 1
@@@@ -295,10 +295,10 @@@@
d157 1
a157 1
@@@@ -310,7 +310,7 @@@@
d166 1
a166 1
@@@@ -327,7 +327,7 @@@@
d175 1
a175 1
@@@@ -474,9 +474,9 @@@@
d187 1
a187 1
@@@@ -493,9 +493,9 @@@@
d200 1
a200 1
@@@@ -521,7 +521,7 @@@@
d209 1
a209 1
@@@@ -539,7 +539,7 @@@@
d218 1
a218 1
@@@@ -551,7 +551,7 @@@@
d227 1
a227 1
@@@@ -559,7 +559,7 @@@@
d236 1
a236 1
@@@@ -567,7 +567,7 @@@@
d245 1
a245 1
@@@@ -575,7 +575,7 @@@@
d254 1
a254 1
@@@@ -583,7 +583,7 @@@@
d263 1
a263 1
@@@@ -596,9 +596,9 @@@@
d276 1
a276 1
@@@@ -620,21 +620,20 @@@@
d303 1
a303 1
@@@@ -653,7 +652,7 @@@@
d312 1
a312 1
@@@@ -705,11 +704,11 @@@@
d326 1
a326 1
@@@@ -743,16 +742,15 @@@@
d348 1
a348 1
@@@@ -760,7 +758,7 @@@@
d357 1
a357 1
@@@@ -792,7 +790,7 @@@@
d366 1
a366 1
@@@@ -870,21 +868,21 @@@@
d395 1
a395 1
@@@@ -1157,11 +1155,9 @@@@
d409 1
a409 1
@@@@ -1185,8 +1181,8 @@@@
d420 1
a420 1
@@@@ -1206,7 +1202,7 @@@@
d429 1
a429 1
@@@@ -1232,7 +1228,7 @@@@
d438 1
a438 1
@@@@ -1242,16 +1238,15 @@@@
d458 1
a458 1
@@@@ -1311,7 +1306,7 @@@@
d467 18
a484 1
@@@@ -1399,7 +1394,7 @@@@
d493 1
a493 1
@@@@ -1754,7 +1749,7 @@@@
d502 1
a502 1
@@@@ -1877,32 +1872,32 @@@@
d540 1
a540 1
@@@@ -2040,7 +2035,7 @@@@
d549 3
a551 3
@@@@ -3162,16 +3157,16 @@@@
 {
     if(context && ps_global->context_list->next && context_isambig(folder)){
d569 1
a569 1
@@@@ -3295,14 +3290,14 @@@@
d586 1
a586 1
@@@@ -3310,7 +3305,7 @@@@
d595 1
a595 1
@@@@ -3319,7 +3314,7 @@@@
d604 1
a604 1
@@@@ -3333,7 +3328,7 @@@@
d613 1
a613 1
@@@@ -3355,7 +3350,7 @@@@
d622 1
a622 1
@@@@ -3374,7 +3369,7 @@@@
d631 1
a631 1
@@@@ -3387,18 +3382,18 @@@@
d653 1
a653 1
@@@@ -3512,7 +3507,7 @@@@
d662 1
a662 1
@@@@ -3520,7 +3515,7 @@@@
d671 1
a671 1
@@@@ -3593,7 +3588,7 @@@@
d680 1
a680 1
@@@@ -4180,32 +4175,32 @@@@
d718 1
a718 1
@@@@ -4321,15 +4316,15 @@@@
d738 1
a738 1
@@@@ -4342,7 +4337,7 @@@@
d747 1
a747 1
@@@@ -4578,7 +4573,7 @@@@
d756 16
a771 1
@@@@ -4659,7 +4654,7 @@@@
d780 1
a780 1
@@@@ -4742,7 +4737,7 @@@@
d789 1
a789 1
@@@@ -4823,14 +4818,13 @@@@
d808 1
a808 1
@@@@ -4996,9 +4990,9 @@@@
d820 1
a820 1
@@@@ -5007,7 +5001,7 @@@@
d829 1
a829 1
@@@@ -5047,10 +5041,8 @@@@
d842 1
a842 1
@@@@ -5061,13 +5053,10 @@@@
d857 1
a857 1
@@@@ -5093,17 +5082,15 @@@@
d879 1
a879 1
@@@@ -5122,7 +5109,7 @@@@
d888 1
a888 1
@@@@ -5130,7 +5117,7 @@@@
d897 1
a897 1
@@@@ -5430,18 +5417,18 @@@@
d921 1
a921 1
@@@@ -5458,11 +5445,11 @@@@
d936 1
a936 1
@@@@ -5725,7 +5712,7 @@@@
d945 1
a945 1
@@@@ -5808,7 +5795,7 @@@@
d954 1
a954 1
@@@@ -5852,7 +5839,7 @@@@
d963 1
a963 1
@@@@ -6060,14 +6047,14 @@@@
d980 1
a980 1
@@@@ -6079,7 +6066,7 @@@@
d989 1
a989 1
@@@@ -6150,7 +6137,7 @@@@
d998 1
a998 1
@@@@ -6267,7 +6254,7 @@@@
d1007 1
a1007 1
@@@@ -6393,7 +6380,7 @@@@
d1016 1
a1016 1
@@@@ -6503,15 +6490,15 @@@@
d1035 1
a1035 1
@@@@ -6519,7 +6506,7 @@@@
d1044 1
a1044 1
@@@@ -6618,7 +6605,7 @@@@
d1053 1
a1053 1
@@@@ -6799,7 +6786,7 @@@@
d1062 1
a1062 1
@@@@ -6896,7 +6883,7 @@@@
d1071 1
a1071 1
@@@@ -6913,7 +6900,7 @@@@
d1080 1
a1080 1
@@@@ -6926,7 +6913,7 @@@@
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/mailcmd.c.orig	Fri Jul 17 13:57:21 1998
+++ pine/mailcmd.c	Tue Aug  4 12:42:17 1998
@@@@ -110,39 +110,39 @@@@
d64 1
a64 1
@@@@ -152,24 +152,24 @@@@
d99 1
a99 1
@@@@ -179,18 +179,18 @@@@
d126 1
a126 1
@@@@ -244,7 +244,7 @@@@
d135 1
a135 1
@@@@ -273,7 +273,7 @@@@
d144 1
a144 1
@@@@ -297,10 +297,10 @@@@
d157 1
a157 1
@@@@ -312,7 +312,7 @@@@
d166 1
a166 1
@@@@ -329,7 +329,7 @@@@
d263 2
a264 1
@@@@ -597,29 +597,28 @@@@
d267 1
a267 1
 		state->mangled_footer = 1;
d270 1
d273 5
a277 4
 		if(F_ON(F_AUTO_EXPUNGE, state)
 		   || want_to(prompt, 'y', 0, NO_HELP, WT_NORM) == 'y'){
 		    msgno_exclude(stream, msgmap);
 		    clear_index_cache();
d303 10
a312 10
@@@@ -634,7 +633,7 @@@@
 		break;
 	    }
 	    else if(ret == 'x') {		/* ^C */
-		cmd_cancelled("Expunge");
+		cmd_cancelled("R");
 		break;
 	    }
 	}
@@@@ -685,11 +684,11 @@@@
d326 1
a326 1
@@@@ -719,16 +718,15 @@@@
d348 1
a348 1
@@@@ -736,7 +734,7 @@@@
d357 1
a357 1
@@@@ -768,7 +766,7 @@@@
d366 1
a366 1
@@@@ -846,21 +844,21 @@@@
d395 1
a395 1
@@@@ -1133,11 +1131,9 @@@@
d409 1
a409 1
@@@@ -1161,8 +1157,8 @@@@
d420 1
a420 1
@@@@ -1182,7 +1178,7 @@@@
d429 1
a429 1
@@@@ -1208,7 +1204,7 @@@@
d438 1
a438 1
@@@@ -1218,16 +1214,15 @@@@
d458 1
a458 1
@@@@ -1289,7 +1284,7 @@@@
d467 1
a467 1
@@@@ -1380,7 +1375,7 @@@@
d476 1
a476 1
@@@@ -1735,7 +1730,7 @@@@
d485 1
a485 1
@@@@ -1858,32 +1853,32 @@@@
d523 1
a523 1
@@@@ -2021,7 +2016,7 @@@@
d532 1
a532 1
@@@@ -3126,16 +3121,16 @@@@
d552 1
a552 1
@@@@ -3259,14 +3254,14 @@@@
d569 1
a569 1
@@@@ -3274,7 +3269,7 @@@@
d578 1
a578 1
@@@@ -3283,7 +3278,7 @@@@
d587 1
a587 1
@@@@ -3297,7 +3292,7 @@@@
d596 1
a596 1
@@@@ -3319,7 +3314,7 @@@@
d605 1
a605 1
@@@@ -3338,7 +3333,7 @@@@
d614 1
a614 1
@@@@ -3351,18 +3346,18 @@@@
d636 1
a636 1
@@@@ -3474,7 +3469,7 @@@@
d645 1
a645 1
@@@@ -3482,7 +3477,7 @@@@
d654 1
a654 1
@@@@ -3555,7 +3550,7 @@@@
d663 1
a663 1
@@@@ -4131,32 +4126,32 @@@@
d701 1
a701 1
@@@@ -4272,15 +4267,15 @@@@
d721 1
a721 1
@@@@ -4293,7 +4288,7 @@@@
d730 1
a730 1
@@@@ -4529,7 +4524,7 @@@@
d739 1
a739 1
@@@@ -4610,7 +4605,7 @@@@
d748 1
a748 1
@@@@ -4693,7 +4688,7 @@@@
d757 1
a757 1
@@@@ -4774,14 +4769,13 @@@@
d776 1
a776 1
@@@@ -4947,9 +4941,9 @@@@
d788 1
a788 1
@@@@ -4958,7 +4952,7 @@@@
d797 1
a797 1
@@@@ -4998,10 +4992,8 @@@@
d810 1
a810 1
@@@@ -5012,13 +5004,10 @@@@
d825 1
a825 1
@@@@ -5042,17 +5031,15 @@@@
d847 1
a847 1
@@@@ -5071,7 +5058,7 @@@@
d856 1
a856 1
@@@@ -5079,7 +5066,7 @@@@
d865 1
a865 1
@@@@ -5368,18 +5355,18 @@@@
d889 1
a889 1
@@@@ -5396,11 +5383,11 @@@@
d904 1
a904 1
@@@@ -5663,7 +5650,7 @@@@
d913 1
a913 1
@@@@ -5746,7 +5733,7 @@@@
d922 1
a922 1
@@@@ -5790,7 +5777,7 @@@@
d931 1
a931 1
@@@@ -5998,14 +5985,14 @@@@
d948 1
a948 1
@@@@ -6017,7 +6004,7 @@@@
d957 1
a957 1
@@@@ -6088,7 +6075,7 @@@@
d966 1
a966 1
@@@@ -6205,7 +6192,7 @@@@
d975 1
a975 1
@@@@ -6331,7 +6318,7 @@@@
d984 1
a984 1
@@@@ -6441,15 +6428,15 @@@@
d1003 1
a1003 1
@@@@ -6457,7 +6444,7 @@@@
d1012 1
a1012 1
@@@@ -6556,7 +6543,7 @@@@
d1021 1
a1021 1
@@@@ -6735,7 +6722,7 @@@@
d1030 1
a1030 1
@@@@ -6832,7 +6819,7 @@@@
d1039 1
a1039 1
@@@@ -6849,7 +6836,7 @@@@
d1048 1
a1048 1
@@@@ -6862,7 +6849,7 @@@@
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 135
a135 76
--- pine/mailpart.c.orig	Tue Jul 21 03:18:49 1998
+++ pine/mailpart.c	Tue Jul 28 08:35:04 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')}},
+	{">","[˵]",{MC_VIEW_ATCH,5,{'v','>','.',ctrl('M'),ctrl('J')}},
 	  KS_VIEW},
-	{"P", "PrevAttch",{MC_PREVITEM,4,{'p',ctrl('B'),ctrl('P'),KEY_UP}},
+	{"P", "e@@",{MC_PREVITEM,4,{'p',ctrl('B'),ctrl('P'),KEY_UP}},
 	  KS_PREVMSG},
-	{"N", "NextAtch",
+	{"N", "@@",
 	 {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", "s", {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","",{MC_ABOUTATCH,1,{'a'}},KS_NONE},
 	WHEREIS_MENU,
-	{"%", "Print", MC_PRINTMSG,1,{'%'}, KS_PRINT},
+	{"%", "CL", 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","[˵ 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","e@@ URL",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
+	{"^F","@@ 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},
+	{"%", "CL", 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!");
+			 "P@@ɶȯ˵@@ʫHI");
 	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.",
+	"H %s Ȧ@@(H)ASC",
 	long2string(mn_get_cur(ps->msgmap)));
d137 18
a154 3
     /*
@@@@ -471,7 +471,7 @@@@
 	  break;
d156 12
a167 12
 	if(ps->mangled_header){
-	    set_titlebar("ATTACHMENT INDEX", ps->mail_stream,
+	    set_titlebar("", 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 = "ץX";
d170 31
a200 4
 	    if(km_popped){
@@@@ -630,7 +630,7 @@@@
 	    if(ctmp = next_attline(current))
 	      current = ctmp;
d202 23
a224 2
-	      q_status_message(SM_ORDER, 0, 1, "Already on last attachment");
+	      q_status_message(SM_ORDER, 0, 1, "wg̫@@F");
d226 2
a227 1
 	    break;
d229 58
a286 3
@@@@ -638,7 +638,7 @@@@
 	    if(ctmp = prev_attline(current))
 	      current = ctmp;
d288 2
a289 2
-	      q_status_message(SM_ORDER, 0, 1, "Already on first attachment");
+	      q_status_message(SM_ORDER, 0, 1, "wgĤ@@ӪF");
d292 7
d300 38
a337 1
@@@@ -652,7 +652,7 @@@@
d340 6
a345 4
 	      q_status_message(SM_ORDER, 0, 1,
-			       "Already on last page of attachments");
+			       "wgb󪺳̫@@F");
 	    
d347 9
a355 2
 	    break;
@@@@ -673,7 +673,7 @@@@
d358 96
a453 3
 	      q_status_message(SM_ORDER, 0, 1,
-			       "Already on first page of attachments");
+			       "wgb󪺲Ĥ@@F");
d455 72
d529 1
a529 1
@@@@ -1041,7 +1041,7 @@@@
d531 17
a547 1
     bitmap_t	 bitmap;
d549 14
a562 20
-    set_titlebar("ATTACHMENT INDEX", ps_global->mail_stream,
+    set_titlebar("", 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", "ɮצC"},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL}};
@@@@ -1242,7 +1242,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 = "UH";
d566 7
a572 40
@@@@ -1250,7 +1250,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 = "";
     }
 
     att_save_opts[++r].ch = -1;
@@@@ -1469,7 +1469,7 @@@@
 				a->number, 
 				save_folder);
 	    else if(rv == -1)
-	      cmd_cancelled("Attached message Save");
+	      cmd_cancelled("sJ[T");
 	    /* else whatever broke in save_fetch_append shoulda bitched */
 
 	    so_give(&so);
@@@@ -1545,11 +1545,11 @@@@
 
 	if(rv == 1)
 	  q_status_message2(SM_ORDER, 0, 4,
-			    "Attached digest (part %s) saved to \"%s\"",
+			    "[ digest( %s ) s \"%s\"",
 			    a->number, 
 			    save_folder);
 	else if(rv == -1)
-	  cmd_cancelled("Attached digest Save");
+	  cmd_cancelled("sJ[ digest");
 	/* else whatever broke in save_fetch_append shoulda bitched */
 
 	if(our_stream)
@@@@ -1603,7 +1603,7 @@@@
     ATTACH_S *ap = a;
     STORE_S  *store;
     static ESCKEY_S opts[] = {
-	{ctrl('T'), 10, "^T", "To Files"},
+	{ctrl('T'), 10, "^T", "ɮצC"},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL}};
d574 7
a580 6
@@@@ -1611,7 +1611,7 @@@@
 	opts[i].ch    =  ctrl('I');
 	opts[i].rval  = 11;
 	opts[i].name  = "TAB";
-	opts[i].label = "Complete";
+	opts[i].label = "";
d582 1
d584 3
a586 4
     filename[0] = full_filename[0] = '\0';
@@@@ -1624,7 +1624,7 @@@@
     if(rv < 0){
 	switch(rv){
d588 2
a589 2
-	    cmd_cancelled("Export");
+	    cmd_cancelled("ץXɮ");
d593 44
a636 4
@@@@ -1676,7 +1676,7 @@@@
     ATTACH_S *ap;
     STORE_S  *store;
     static ESCKEY_S opts[] = {
d642 37
a678 6
@@@@ -1684,7 +1684,7 @@@@
 	opts[i].ch    =  ctrl('I');
 	opts[i].rval  = 11;
 	opts[i].name  = "TAB";
-	opts[i].label = "Complete";
+	opts[i].label = "";
d681 15
a695 8
     filename[0] = full_filename[0] = '\0';
@@@@ -1697,7 +1697,7 @@@@
     if(rv < 0){
 	switch(rv){
 	  case -1:
-	    cmd_cancelled("Export");
+	    cmd_cancelled("ץXɮ");
 	    break;
d697 38
a734 48
 	  case -2:
@@@@ -1905,14 +1905,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",
+		     "p %s%s%s 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) ? " ոզsɡC" : "");
 	else
 	  q_status_message1(SM_ORDER | SM_DING, 3, 5,
-			    "Don't know how to unpack \"%s\" encoding",
+			    "pѶ} \"%s\" sX",
 			    body_encodings[(a->body->encoding <= ENCMAX)
 					     ? a->body->encoding : ENCOTHER]);
 
@@@@ -2101,7 +2101,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("r", store, src, handles, a, flags);
 	free_handles(&handles);
 	so_give(&store);	/* free resources associated with store */
     }
@@@@ -2276,22 +2276,22 @@@@
     memset(&sargs, 0, sizeof(SCROLL_S));
     sargs.text.text    = so_text(store);
     sargs.text.src     = src;
-    sargs.text.desc    = "attachment";
+    sargs.text.desc    = "";
     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   = "˵rU";
     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 = "Hr";
d736 2
a737 3
     else{
-	att_view_keymenu.keys[ATV_BACK_KEY].label = "AttchIndex";
+	att_view_keymenu.keys[ATV_BACK_KEY].label = "";
d740 114
a853 58
     if(!handles){
@@@@ -2705,10 +2705,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  = "T";
+    sargs.bar.title  = "";
     sargs.help.text  = h_simple_text_view;
-    sargs.help.title = "HELP FOR \"ABOUT ATTACHMENT\"";
+    sargs.help.title = "\"\"U";
 
     scrolltool(&sargs);
 
@@@@ -2770,7 +2770,7 @@@@
 		else		/* partially formatted outgoing message */
 		  pine_send(outgoing, &body,
 			    ps_global->nr_mode
-			      ? "SEND MESSAGE" : "FORWARD MESSAGE",
+			      ? "eXH" : "HH",
 			    NULL, NULL, NULL, NULL, NULL, FALSE);
 
 		ps_global->mangled_screen = 1;
@@@@ -2856,7 +2856,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 ? "eXH" : "HH",
 			    NULL, NULL, NULL, NULL, NULL, FALSE);
 
 		ps_global->mangled_screen = 1;
@@@@ -2953,7 +2953,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, "sH^",
 			  fcc.tptr, NULL, NULL, NULL, NULL, 0);
 
 		pine_free_body(&body);
@@@@ -3034,7 +3034,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 ? "ѽX᪺" : "l";
 	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,
@@@@ -3052,7 +3052,7 @@@@
 	}
 	else if(rc == 0){
 	    if(pipe_command[0] == '\0'){
-		cmd_cancelled("Pipe command");
+		cmd_cancelled("ɦVRO");
 		break;
d855 33
d889 19
a907 1
@@@@ -3126,7 +3126,7 @@@@
d909 116
d1026 28
a1053 6
 	else if(rc == 1){
-	    cmd_cancelled("Pipe");
+	    cmd_cancelled("ɦV");
 	    break;
 	}
 	else if(rc = 3)
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 23
a23 131
--- pine/pine.h.orig	Tue Jul  7 10:06:18 1998
+++ pine/pine.h	Wed Jul 15 17:02:37 1998
@@@@ -348,7 +348,7 @@@@
 			   && (s) && !strucmp((s),"X-VCARD")))
 #define	MIME_VCARD_A(a)	MIME_VCARD((a)->body->type, (a)->body->subtype)
 
-#define STYLE_NAME(a)   ((a)->text.desc ? (a)->text.desc : "text")
+#define STYLE_NAME(a)   ((a)->text.desc ? (a)->text.desc : "r")
 
 
 /*
@@@@ -1581,91 +1581,91 @@@@
  * Some standard Key/Command Bindings 
  */
 #define	NULL_MENU	{NULL, NULL, {MC_NONE}, KS_NONE}
-#define	HELP_MENU	{"?", "Help", \
+#define	HELP_MENU	{"?", "U", \
 			 {MC_HELP, 2, {'?',ctrl('G')}}, \
 			 KS_SCREENHELP}
-#define	OTHER_MENU	{"O", "OTHER CMDS", \
+#define	OTHER_MENU	{"O", "LRO", \
 			 {MC_OTHER, 1, {'o'}}, \
 			 KS_NONE}
-#define	WHEREIS_MENU	{"W", "WhereIs", \
+#define	WHEREIS_MENU	{"W", "jM", \
 			 {MC_WHEREIS, 2, {'w',ctrl('W')}}, \
 			 KS_WHEREIS}
-#define	MAIN_MENU	{"M", "Main Menu", \
+#define	MAIN_MENU	{"M", "D", \
 			 {MC_MAIN, 1, {'m'}}, \
 			 KS_MAINMENU}
-#define	QUIT_MENU	{"Q", "Quit Pine", \
+#define	QUIT_MENU	{"Q", "} Pine", \
 			 {MC_QUIT, 1, {'q'}}, \
 			 KS_EXIT}
-#define	PREVMSG_MENU	{"P", "PrevMsg", \
+#define	PREVMSG_MENU	{"P", "e@@", \
 			 {MC_PREVITEM, 1, {'p'}}, \
 			 KS_PREVMSG}
-#define	NEXTMSG_MENU	{"N", "NextMsg", \
+#define	NEXTMSG_MENU	{"N", "U@@", \
 			 {MC_NEXTITEM, 1, {'n'}}, \
 			 KS_NEXTMSG}
-#define	PREVPAGE_MENU	{"-", "PrevPage", \
+#define	PREVPAGE_MENU	{"-", "e@@", \
 			 {MC_PAGEUP, 3, {'-',ctrl('Y'),KEY_PGUP}}, \
 			 KS_PREVPAGE}
-#define	NEXTPAGE_MENU	{"Spc", "NextPage", \
+#define	NEXTPAGE_MENU	{"Spc", "U@@", \
 			 {MC_PAGEDN, 4, {'+',' ',ctrl('V'),KEY_PGDN}}, \
 			 KS_NEXTPAGE}
-#define	JUMP_MENU	{"J", "Jump", \
+#define	JUMP_MENU	{"J", "", \
 			 {MC_JUMP, 1, {'j'}}, \
 			 KS_JUMPTOMSG}
-#define	FWDEMAIL_MENU	{"F", "Fwd Email", \
+#define	FWDEMAIL_MENU	{"F", "HH", \
 			{MC_FWDTEXT,1,{'f'}}, \
 			 KS_FORWARD}
-#define	PRYNTMSG_MENU	{"%", "Print", \
+#define	PRYNTMSG_MENU	{"%", "CL", \
 			 {MC_PRINTMSG,1,{'%'}}, \
 			 KS_PRINT}
-#define	PRYNTTXT_MENU	{"%", "Print", \
+#define	PRYNTTXT_MENU	{"%", "CL", \
 			 {MC_PRINTTXT,1,{'%'}}, \
 			 KS_PRINT}
-#define	SAVE_MENU	{"S", "Save", \
+#define	SAVE_MENU	{"S", "s", \
 			 {MC_SAVE,1,{'s'}}, \
 			 KS_SAVE}
-#define	EXPORT_MENU	{"E", "Export", \
+#define	EXPORT_MENU	{"E", "ץX", \
 			 {MC_EXPORT, 1, {'e'}}, \
 			 KS_EXPORT}
-#define	COMPOSE_MENU	{"C", "Compose", \
+#define	COMPOSE_MENU	{"C", "s", \
 			 {MC_COMPOSE,1,{'c'}}, \
 			 KS_COMPOSER}
-#define	DELETE_MENU	{"D", "Delete", \
+#define	DELETE_MENU	{"D", "R", \
 			 {MC_DELETE,2,{'d',KEY_DEL}}, \
 			 KS_DELETE}
-#define	UNDELETE_MENU	{"U", "Undelete", \
+#define	UNDELETE_MENU	{"U", "_R", \
 			 {MC_UNDELETE,1,{'u'}}, \
 			 KS_UNDELETE}
-#define	REPLY_MENU	{"R", "Reply", \
+#define	REPLY_MENU	{"R", "^", \
 			 {MC_REPLY,1,{'r'}}, \
 			 KS_REPLY}
-#define	FORWARD_MENU	{"F", "Forward", \
+#define	FORWARD_MENU	{"F", "H", \
 			 {MC_FORWARD,1,{'f'}}, \
 			 KS_FORWARD}
-#define	LISTFLD_MENU	{"L", "ListFldrs", \
+#define	LISTFLD_MENU	{"L", "ƧXC", \
 			 {MC_COLLECTIONS,1,{'l'}}, \
 			 KS_FLDRLIST}
-#define	INDEX_MENU	{"I", "Index", \
+#define	INDEX_MENU	{"I", "", \
 			 {MC_INDEX,1,{'i'}}, \
 			 KS_FLDRINDEX}
-#define	GOTO_MENU	{"G", "GotoFldr", \
+#define	GOTO_MENU	{"G", "ƧX", \
 			 {MC_GOTO,1,{'g'}}, \
 			 KS_GOTOFLDR}
-#define	TAKE_MENU	{"T", "TakeAddr", \
+#define	TAKE_MENU	{"T", "oa}", \
 			 {MC_TAKE,1,{'t'}}, \
 			 KS_TAKEADDR}
-#define	FLAG_MENU	{"*", "Flag", \
+#define	FLAG_MENU	{"*", "X", \
 			 {MC_FLAG,1,{'*'}}, \
 			 KS_FLAG}
-#define	PIPE_MENU	{"|", "Pipe", \
+#define	PIPE_MENU	{"|", "V(Pipe)", \
 			 {MC_PIPE,1,{'|'}}, \
 			 KS_NONE}
-#define	BOUNCE_MENU	{"B", "Bounce", \
+#define	BOUNCE_MENU	{"B", "hH", \
 			 {MC_BOUNCE,1,{'b'}}, \
 			 KS_BOUNCE}
-#define	HDRMODE_MENU	{"H", "HdrMode", \
+#define	HDRMODE_MENU	{"H", "Y", \
 			 {MC_FULLHDR,1,{'h'}}, \
 			 KS_HDRMODE}
-#define	TAB_MENU	{"Tab", "NextNew", \
+#define	TAB_MENU	{"Tab", "U@@ӷs", \
 			 {MC_TAB,1,{TAB}}, \
 			 KS_NONE}
d25 343
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@d1 131
a131 3
--- pine/mailcmd.c.orig	Tue Feb 25 05:57:22 1997
+++ pine/mailcmd.c	Sat Jan 17 21:05:19 1998
@@@@ -128,14 +128,14 @@@@
a132 169
 static char *sel_pmt3 = "APPLY command : ";
 static ESCKEY_S sel_opts3[] = {
-    {'d', 'd',  "D", "Del"},
-    {'u', 'u',  "U", "Undel"},
-    {'r', 'r',  "R", "Reply"},
-    {'f', 'f',  "F", "Forward"},
-    {'y', 'y',  "Y", "prYnt"},
+    {'d', 'd',  "D", "R"},
+    {'u', 'u',  "U", "Ϧ^R"},
+    {'r', 'r',  "R", "^H"},
+    {'f', 'f',  "F", "H"},
+    {'y', 'y',  "Y", "CL"},
     {'t', 't',  "T", "TakeAddr"},
-    {'s', 's',  "S", "Save"},
-    {'e', 'e',  "E", "Export"},
+    {'s', 's',  "S", "s"},
+    {'e', 'e',  "E", "ץX"},
     { -1,   0, NULL, NULL},
     { -1,   0, NULL, NULL},
     { -1,   0, NULL, NULL},
@@@@ -203,6 +203,9 @@@@
     int		 command, in_index, orig_command;
     int		*force_mailchk;
 {
+/*  GaryLee :3 */
+    static char		WhereFrom = 0 ;
+    static char		current_cmd_status ;
     int           question_line, a_changed, is_unread, we_cancel;
     long          new_msgno, del_count, old_msgno, cur_msgno, i,
 		  hide_count, exld_count, select_count, old_max_msgno;
@@@@ -225,6 +228,12 @@@@
     a_changed             = 0;
     *force_mailchk        = 0;
 
+/* GaryLee:3 */
+	if(state->prev_screen == main_menu_screen )
+		WhereFrom = 'm' ;
+	else if( state->prev_screen == folder_screen )	
+		WhereFrom = 'l' ;
+
     switch (command)
       {
           /*------------- Help --------*/
@@@@ -253,6 +262,16 @@@@
 
 
           /*--------- Return to main menu ------------*/
+        case KEY_LEFT:
+	if(current_cmd_status)
+		goto do_index ;
+        /* GaryLee :3 */
+        if (WhereFrom == 'l')
+        {
+		state->next_screen = folder_screen;
+		break;
+        }
+
         case PF3: 
         case 'm':
           if(state->nr_mode && command == 'm')
@@@@ -269,6 +288,7 @@@@
 
           /*------- View mail or attachment --------*/
         case ctrl('M'):
+        case KEY_RIGHT:
         case ctrl('J'):
 	  if(!in_index){
 	      q_status_message(SM_ORDER | SM_DING, 0, 3,
@@@@ -278,6 +298,7 @@@@
 
         case PF4:
         case 'v':
+          current_cmd_status = 1 ;
 	  if(in_index) {
 	      if(any_messages(msgmap, NULL, "to View")){
 		  state->next_screen = mail_view_screen;
@@@@ -489,6 +510,7 @@@@
         case OPF7:
         case 'i':
 do_index:
+	current_cmd_status = 0 ;
           if(!in_index) {
 #if	defined(DOS) && !defined(WIN32)
 	      flush_index_cache();		/* save room on PC */
@@@@ -1871,7 +1893,7 @@@@
     ekey[rc].ch      = ctrl('T');
     ekey[rc].rval    = 2;
     ekey[rc].name    = "^T";
-    ekey[rc++].label = "To Fldrs";
+    ekey[rc++].label = "HC";
 
     if(saveable_count > 1){
 	ekey[rc].ch      = ctrl('P');
@@@@ -1889,7 +1911,7 @@@@
 	ekey[rc].ch      = TAB;
 	ekey[rc].rval    = 12;
 	ekey[rc].name    = "TAB";
-	ekey[rc++].label = "Complete";
+	ekey[rc++].label = "";
     }
 
     if(saveable_count > 1){
@@@@ -2753,7 +2775,7 @@@@
     STORE_S  *store;
     struct variable *vars = ps_global->vars;
     static ESCKEY_S export_opts[] = {
-	{ctrl('T'), 10, "^T", "To Files"},
+	{ctrl('T'), 10, "^T", "ɮצC"},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL}};
@@@@ -2774,7 +2796,7 @@@@
 	export_opts[++i].ch  = ctrl('V');
 	export_opts[i].rval  = 12;
 	export_opts[i].name  = "^V";
-	export_opts[i].label = "Downld Msg";
+	export_opts[i].label = "U";
     }
 #endif	/* !(DOS || MAC) */
 
@@@@ -2782,7 +2804,7 @@@@
 	export_opts[++i].ch  =  ctrl('I');
 	export_opts[i].rval  = 11;
 	export_opts[i].name  = "TAB";
-	export_opts[i].label = "Complete";
+	export_opts[i].label = "";
     }
 
     export_opts[++i].ch = -1;
@@@@ -2888,7 +2910,7 @@@@
 		     || !format_message(mn_m2raw(msgmap, mn_get_cur(msgmap)),
 					env, b, FM_NEW_MESS|FM_DO_PRINT, pc)){
 		      q_status_message(SM_ORDER | SM_DING, 3, 3,
-			       errstr = "Error writing tempfile for download");
+			       errstr = "gJUȦsɮɵoͿ~");
 		      break;
 		  }
 
@@@@ -2900,18 +2922,18 @@@@
 		      (void) close_system_pipe(&syspipe);
 		    else
 		      q_status_message(SM_ORDER | SM_DING, 3, 3,
-				    errstr = "Error running download command");
+				    errstr = "UROɵoͿ~");
 		}
 
 		unlink(tfp);
 	    }
 	    else
 	      q_status_message(SM_ORDER | SM_DING, 3, 3,
-			     errstr = "Error building temp file for download");
+			     errstr = "LkإߤUΪȦs");
 
 	    fs_give((void **)&tfp);
 	    if(!errstr)
-	      q_status_message(SM_ORDER, 0, 3, "Download Command Completed");
+	      q_status_message(SM_ORDER, 0, 3, "URO");
 
 	    goto fini;
 	}
@@@@ -3354,7 +3376,7 @@@@
 	ekey[rc].ch      = TAB;
 	ekey[rc].rval    = 12;
 	ekey[rc].name    = "TAB";
-	ekey[rc++].label = "Complete";
+	ekey[rc++].label = "";
     }
 
     if(ps_global->context_list->next){
@
