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.52;	author keith;	state dead;
branches;
next	1.6;

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

1.5
date	99.03.15.01.45.41;	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.38;	author vanilla;	state Exp;
branches;
next	1.1;

1.1
date	98.02.02.14.34.34;	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/addrbook.c.orig	Fri Sep 10 05:35:09 1999
+++ pine/addrbook.c	Thu Oct 14 11:37:56 1999
@@@@ -129,14 +129,14 @@@@
 char	      *pcpine_help_addrbook PROTO((char *));
 #endif
 
-#define CLICKHERE       "[ Address List ]"
-#define EMPTY           "[ Empty ]"
-#define ZOOM_EMPTY      "[ No Selected Entries in this Address Book ]"
-#define ADD_PERSONAL    "    [ Move here to add a Personal Address Book ]"
-#define ADD_GLOBAL      "    [ Move here to add a Global Address Book ]"
-#define DISTLIST        "DISTRIBUTION LIST:"
-#define NOABOOKS        "[ No Address Book Configured ]"
-#define CLICKHERECMB    "[ Select Here to See Expanded List ]"
+#define CLICKHERE       "[ a}C ]"
+#define EMPTY           "[ S󶵥 ]"
+#define ZOOM_EMPTY      "[ CSwQ ]"
+#define ADD_PERSONAL    "    [ o̥[J@@ӭӤHa}ï ]"
+#define ADD_GLOBAL      "    [ o̥[J@@Ӿ骺a}ï ]"
+#define DISTLIST        "CG"
+#define NOABOOKS        "[ Swg]wna}ï ]"
+#define CLICKHERECMB    "[ o̥H˵i}᪺C ]"
 
 
 /*
@@@@ -287,7 +287,7 @@@@
 
 	    dprint(2, (debugfile, "parse_format: ignoring unrecognized word \"%s\" in address-book-formats\n", p));
 	    q_status_message1(SM_ORDER, warnings++==0 ? 1 : 0, 4,
-		"Ignoring unrecognized word \"%s\" in address-book-formats", p);
+		"a}ï榡LkѪr \"%s\"", p);
 	    /* put back space */
 	    if(r)
 	      *r = SPACE;
@@@@ -357,7 +357,7 @@@@
 
     if(column == 0){
 	q_status_message(SM_ORDER, 0, 4,
-	"address-book-formats has no recognizable words, using default format");
+	"ѩba}ï榡䤣쨬HѪrA]ϥιw]Ҧ");
 	goto assign_default;
     }
 
@@@@ -599,7 +599,7 @@@@
     }
     else{
 	q_status_message(SM_ORDER | SM_DING, 5, 10,
-		     "Bug in addrbook, not supposed to happen, re-syncing...");
+		     "a}ï\\तX{w~AsPB...");
 	dprint(1,
 	    (debugfile,
 	"Bug in addrbook (null dlc in dlist(%ld), not supposed to happen\n",
@@@@ -1705,14 +1705,14 @@@@
     mailcap_free(); /* free resources we won't be using for a while */
 
     if(setjmp(addrbook_changed_unexpectedly)){
-	q_status_message(SM_ORDER, 5, 10, "Resetting address book...");
+	q_status_message(SM_ORDER, 5, 10, "b]a}ï...");
 	dprint(1, (debugfile, "RESETTING address book... addr_book_screen!\n"));
 	addrbook_reset();
     }
 
     ab_nesting_level = 1;  /* come here only from main menu */
 
-    (void)addr_book(AddrBookScreen, "ADDRESS BOOK", NULL);
+    (void)addr_book(AddrBookScreen, "a}ï", NULL);
     end_adrbks();
 
     pine_state->prev_screen = addr_book_screen;
@@@@ -1728,14 +1728,14 @@@@
     mailcap_free(); /* free resources we won't be using for a while */
 
     if(setjmp(addrbook_changed_unexpectedly)){
-	q_status_message(SM_ORDER, 5, 10, "Resetting address book...");
+	q_status_message(SM_ORDER, 5, 10, "b]a}ï...");
 	dprint(1, (debugfile, "RESETTING address book... addr_book_config!\n"));
 	addrbook_reset();
     }
 
     ab_nesting_level = 1;
 
-    (void)addr_book(AddrBookConfig, "SETUP ADDRESS BOOKS", NULL);
+    (void)addr_book(AddrBookConfig, "]wa}ï", NULL);
     end_adrbks();
 
     pine_state->prev_screen = addr_book_screen;
@@@@ -1759,7 +1759,7 @@@@
     save_nesting_level = cpyint(ab_nesting_level);
     memcpy(save_jmp_buf, addrbook_changed_unexpectedly, sizeof(jmp_buf));
     if(setjmp(addrbook_changed_unexpectedly)){
-	q_status_message(SM_ORDER, 5, 10, "Resetting address book...");
+	q_status_message(SM_ORDER, 5, 10, "b]a}ï...");
 	dprint(1,
 	    (debugfile, "RESETTING address book... addr_book_oneaddr!\n"));
 	addrbook_reset();
@@@@ -1768,7 +1768,7 @@@@
 
     ab_nesting_level++;
 
-    p = addr_book(SelectAddr, "SELECT ADDRESS", NULL);
+    p = addr_book(SelectAddr, "ܦa}", NULL);
 
     if(ab_nesting_level <= 1)
       end_adrbks();
@@@@ -1844,7 +1844,7 @@@@
     save_nesting_level = cpyint(ab_nesting_level);
     memcpy(save_jmp_buf, addrbook_changed_unexpectedly, sizeof(jmp_buf));
     if(setjmp(addrbook_changed_unexpectedly)){
-	q_status_message(SM_ORDER, 5, 10, "Resetting address book...");
+	q_status_message(SM_ORDER, 5, 10, "b]a}ï...");
 	dprint(1,
 	    (debugfile, "RESETTING address book... addr_book_compose!\n"));
 	addrbook_reset();
@@@@ -1853,7 +1853,7 @@@@
 
     ab_nesting_level++;
 
-    p = addr_book(SelectNicksCom, "COMPOSER: SELECT ADDRESS", error);
+    p = addr_book(SelectNicksCom, "s边GܦC", error);
 
     if(ab_nesting_level <= 1)
       end_adrbks();
@@@@ -1888,7 +1888,7 @@@@
     save_nesting_level = cpyint(ab_nesting_level);
     memcpy(save_jmp_buf, addrbook_changed_unexpectedly, sizeof(jmp_buf));
     if(setjmp(addrbook_changed_unexpectedly)){
-	q_status_message(SM_ORDER, 5, 10, "Resetting address book...");
+	q_status_message(SM_ORDER, 5, 10, "b]a}ï...");
 	dprint(1,
 	    (debugfile, "RESETTING address book... addr_book_compose_lcc!\n"));
 	addrbook_reset();
@@@@ -1901,7 +1901,7 @@@@
      * We used to use SelectAddrLccCom here but decided it wasn't necessary
      * to restrict the selection to a list.
      */
-    p = addr_book(SelectNicksCom, "COMPOSER: SELECT LIST", error);
+    p = addr_book(SelectNicksCom, "s边GܦC", error);
 
     if(ab_nesting_level <= 1)
       end_adrbks();
@@@@ -1936,7 +1936,7 @@@@
     save_nesting_level = cpyint(ab_nesting_level);
     memcpy(save_jmp_buf, addrbook_changed_unexpectedly, sizeof(jmp_buf));
     if(setjmp(addrbook_changed_unexpectedly)){
-	q_status_message(SM_ORDER, 5, 10, "Resetting address book...");
+	q_status_message(SM_ORDER, 5, 10, "b]a}ï...");
 	dprint(1,
 	    (debugfile, "RESETTING address book... addr_book_change_list!\n"));
 	addrbook_reset();
@@@@ -1945,7 +1945,7 @@@@
 
     ab_nesting_level++;
 
-    p = addr_book(SelectNicksCom, "ADDRESS BOOK (Update): SELECT ADDRESSES",
+    p = addr_book(SelectNicksCom, "a}ï (s)Gܦa}",
 		  error);
 
     if(ab_nesting_level <= 1)
@@@@ -1978,7 +1978,7 @@@@
     save_nesting_level = cpyint(ab_nesting_level);
     memcpy(save_jmp_buf, addrbook_changed_unexpectedly, sizeof(jmp_buf));
     if(setjmp(addrbook_changed_unexpectedly)){
-	q_status_message(SM_ORDER, 5, 10, "Resetting address book...");
+	q_status_message(SM_ORDER, 5, 10, "b]a}ï...");
 	dprint(1,
 	    (debugfile, "RESETTING address book...addr_book_bounce!\n"));
 	addrbook_reset();
@@@@ -1987,7 +1987,7 @@@@
 
     ab_nesting_level++;
 
-    p = addr_book(SelectManyNicks, "SELECT ADDRESSES", NULL);
+    p = addr_book(SelectManyNicks, "ܦa}", NULL);
 
     if(ab_nesting_level <= 1)
       end_adrbks();
@@@@ -2019,7 +2019,7 @@@@
     save_nesting_level = cpyint(ab_nesting_level);
     memcpy(save_jmp_buf, addrbook_changed_unexpectedly, sizeof(jmp_buf));
     if(setjmp(addrbook_changed_unexpectedly)){
-	q_status_message(SM_ORDER, 5, 10, "Resetting address book...");
+	q_status_message(SM_ORDER, 5, 10, "b]a}ï...");
 	dprint(1,
 	    (debugfile, "RESETTING address book...addr_book_takeaddr!\n"));
 	addrbook_reset();
@@@@ -2028,7 +2028,7 @@@@
 
     ab_nesting_level++;
 
-    p = addr_book(SelectNickTake, "TAKEADDR: SELECT NICKNAME", NULL);
+    p = addr_book(SelectNickTake, "ܦa}Gܼʺ", NULL);
 
     if(ab_nesting_level <= 1)
       end_adrbks();
@@@@ -2064,7 +2064,7 @@@@
     save_nesting_level = cpyint(ab_nesting_level);
     memcpy(save_jmp_buf, addrbook_changed_unexpectedly, sizeof(jmp_buf));
     if(setjmp(addrbook_changed_unexpectedly)){
-	q_status_message(SM_ORDER, 5, 10, "Resetting address book...");
+	q_status_message(SM_ORDER, 5, 10, "b]a}ï...");
 	dprint(1,
 	    (debugfile, "RESETTING address book...addr_book_nick_for_edit!\n"));
 	addrbook_reset();
@@@@ -2079,7 +2079,7 @@@@
      * and this seemed to be the easiest way to accomplish that.
      */
     as.n_serv = 0;
-    p = addr_book(SelectNickCom, "SELECT NICKNAME", error);
+    p = addr_book(SelectNickCom, "ܼʺ", error);
     as.n_serv = save_n_serv;
 
     if(ab_nesting_level <= 1)
@@@@ -2112,7 +2112,7 @@@@
     save_nesting_level = cpyint(ab_nesting_level);
     memcpy(save_jmp_buf, addrbook_changed_unexpectedly, sizeof(jmp_buf));
     if(setjmp(addrbook_changed_unexpectedly)){
-	q_status_message(SM_ORDER, 5, 10, "Resetting address book...");
+	q_status_message(SM_ORDER, 5, 10, "b]a}ï...");
 	dprint(1,
 	    (debugfile, "RESETTING address book...addr_book_selnick!\n"));
 	addrbook_reset();
@@@@ -2121,7 +2121,7 @@@@
 
     ab_nesting_level++;
 
-    p = addr_book(SelectNick, "SELECT NICKNAME", NULL);
+    p = addr_book(SelectNick, "ܼʺ", NULL);
 
     if(ab_nesting_level <= 1)
       end_adrbks();
@@@@ -2144,8 +2144,8 @@@@
 	NULL_MENU,
 	NULL_MENU,
 	NULL_MENU,
-	{"P", "PrevEntry", {MC_PREVITEM,1,{'p'}}, KS_NONE},
-	{"N", "NextEntry", {MC_NEXTITEM,1,{'n'}}, KS_NONE},
+	{"P", "e@@Ӷ", {MC_PREVITEM,1,{'p'}}, KS_NONE},
+	{"N", "@@Ӷ", {MC_NEXTITEM,1,{'n'}}, KS_NONE},
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
 	NULL_MENU,
@@@@ -2168,10 +2168,10 @@@@
 
         HELP_MENU,
 	OTHER_MENU,
-	{";","Select",{MC_SELECT,1,{';'}},KS_NONE},
-	{"A","Apply",{MC_APPLY,1,{'a'}},KS_APPLY},
-	{":","SelectCur",{MC_SELCUR,1,{':'}},KS_SELECTCUR},
-	{"Z","ZoomMode",{MC_ZOOM,1,{'z'}},KS_NONE},
+	{";","",{MC_SELECT,1,{';'}},KS_NONE},
+	{"A","M",{MC_APPLY,1,{'a'}},KS_APPLY},
+	{":","ܥثe",{MC_SELCUR,1,{':'}},KS_SELECTCUR},
+	{"Z","YҦ",{MC_ZOOM,1,{'z'}},KS_NONE},
 	NULL_MENU,
 	NULL_MENU,
 	NULL_MENU,
@@@@ -2303,7 +2303,7 @@@@
     if(!init_addrbooks(HalfOpen, 1, !as.config, !are_selecting)){
 	if(are_selecting){
 	    q_status_message(SM_ORDER | SM_DING, 0, 4,
-			     "No Address Book Configured");
+			     "Sw]wa}ï");
 	    display_message(c);
 	    sleep(2);
 	    return NULL;
@@@@ -2311,7 +2311,7 @@@@
 	else if(!as.config){
             ps->next_screen = main_menu_screen;
 	    q_status_message(SM_ORDER | SM_DING, 3, 4,
-		    "No Address Book Configured, Use SETUP Addressbook screen");
+		    "Sw]wa}ïAХ SETUP Addressbook \\e");
 	    ps->mangled_screen = 1;
 	    return NULL;
 	}
@@@@ -2321,7 +2321,7 @@@@
 	  readonly_warning(NO_DING, NULL);
 	else if(as.adrbks[0].access == NoAccess)
 	  q_status_message(SM_ORDER, 0, 4,
-			   "AddressBook not accessible, permission denied");
+			   "a}ïTQs");
     }
 
     erase_checks();
@@@@ -2466,10 +2466,10 @@@@
 
 	    if(style == AddrBookScreen){
 		if(F_ON(F_CMBND_ABOOK_DISP,ps_global))
-		  sprintf(buf, "ADDRESS BOOK%s", (as.n_addrbk > 1) ? "S" : "");
+		  sprintf(buf, "a}ï");
 		else
-		  sprintf(buf, "ADDRESS BOOK%s%s%s",
-			  is_custom_title ? " <" : cur_is_open() ? "" : " LIST",
+		  sprintf(buf, "a}ï%s%s%s",
+			  is_custom_title ? " <" : cur_is_open() ? "" : "C",
 		          is_custom_title ? pab->nickname : "",
 		          is_custom_title ? ">"  : "");
 
@@@@ -2534,7 +2534,7 @@@@
 		km->how_many = 1;
 
 		clrbitn(OTHER_KEY, bitmap);
-		menu_init_binding(km, 'E', MC_EXIT, "E", "Exit Setup", TWO_KEY);
+		menu_init_binding(km, 'E', MC_EXIT, "E", "}", TWO_KEY);
 		KS_OSDATASET(&km->keys[TWO_KEY], KS_EXITMODE);
 
 		/*
@@@@ -2547,22 +2547,22 @@@@
 		    clrbitn(THREE_KEY, bitmap);
 		    menu_init_binding(km, 'A', MC_ADDABOOK, "A",
 				      add_is_global(as.top_ent+as.cur_row)
-					? "[Add Glob Abook]"
-					: "[Add Pers Abook]",
+					? "[sWa}ï]"
+					: "[sWӤHa}ï]",
 				      ADD_KEY);
 		    def_key = ADD_KEY;
 		}
 		else{
-		    menu_init_binding(km, 'D', MC_DELABOOK, "D", "Del Abook",
+		    menu_init_binding(km, 'D', MC_DELABOOK, "D", "Ra}ï",
 				      DELETE_KEY);
-		    menu_init_binding(km, '$', MC_SHUFFLE, "$", "Shuffle",
+		    menu_init_binding(km, '$', MC_SHUFFLE, "$", "",
 				      SENDTO_KEY);
-		    menu_init_binding(km, 'C', MC_EDITABOOK, "C", "[Change]",
+		    menu_init_binding(km, 'C', MC_EDITABOOK, "C", "[ק]",
 				      THREE_KEY);
 		    menu_init_binding(km, 'A', MC_ADDABOOK, "A",
 				      add_is_global(as.top_ent+as.cur_row)
-					? "Add Glob Abook"
-					: "Add Pers Abook",
+					? "sWa}ï"
+					: "sWӤHa}ï",
 				      ADD_KEY);
 		}
 	    }
@@@@ -2575,7 +2575,7 @@@@
 		 * The OTHER_KEY is used as the Exit key in selection mode.
 		 * This is because the TWO_KEY is being used for < actions.
 		 */
-		menu_init_binding(km, 'E', MC_EXIT, "E", "ExitSelect",
+		menu_init_binding(km, 'E', MC_EXIT, "E", "}",
 				  OTHER_KEY);
 		KS_OSDATASET(&km->keys[OTHER_KEY], KS_EXITMODE);
 
@@@@ -2595,8 +2595,8 @@@@
 		      clrbitn(TWO_KEY, bitmap);
 		    else{
 			menu_init_binding(km, '<', cmd, "<",
-					  cmd == MC_POPUP ? "AddressBkList"
-							  : "Unexpand",
+					  cmd == MC_POPUP ? "a}ïC"
+							  : "_i}",
 					  TWO_KEY);
 			menu_add_binding(km, ',', cmd);
 			if(F_ON(F_ARROW_NAV,ps))
@@@@ -2607,16 +2607,16 @@@@
 		    if(checkedn){
 			if(entry_is_clickable_title(as.top_ent+as.cur_row)){
 			    menu_init_binding(km, 'S', MC_CHOICE, "S",
-					      "Select", TWO_KEY);
+					      "", TWO_KEY);
 			}
 			else{
 			    menu_init_binding(km, 'S', MC_CHOICE, "S",
-					      "[Select]", TWO_KEY);
+					      "[]", TWO_KEY);
 			    def_key = TWO_KEY;
 			}
 		    }
 		    else
-		      menu_init_binding(km, 'S', MC_CHOICE, "S", "Select",
+		      menu_init_binding(km, 'S', MC_CHOICE, "S", "",
 				        TWO_KEY);
 		}
 		else
@@@@ -2628,7 +2628,7 @@@@
 		 * key becomes the ViewAbook key.
 		 */
 		if(entry_is_askserver(as.top_ent+as.cur_row) && !as.checkboxes){
-		    menu_init_binding(km, '>', MC_QUERY_SERV, ">", "[Search]",
+		    menu_init_binding(km, '>', MC_QUERY_SERV, ">", "[jM]",
 				      THREE_KEY);
 		    menu_add_binding(km, 's', MC_QUERY_SERV);
 		    menu_add_binding(km, '.', MC_QUERY_SERV);
@@@@ -2636,7 +2636,7 @@@@
 		      menu_add_binding(km, KEY_RIGHT, MC_QUERY_SERV);
 		}
 		else if(entry_is_clickable_title(as.top_ent+as.cur_row)){
-		    menu_init_binding(km, '>', MC_OPENABOOK, ">", "[ViewAbook]",
+		    menu_init_binding(km, '>', MC_OPENABOOK, ">", "[˵a}ï]",
 				      THREE_KEY);
 		    menu_add_binding(km, 'v', MC_OPENABOOK);
 		    menu_add_binding(km, '.', MC_OPENABOOK);
@@@@ -2644,7 +2644,7 @@@@
 		      menu_add_binding(km, KEY_RIGHT, MC_OPENABOOK);
 		}
 		else if(cur_is_open()){
-		    menu_init_binding(km, 'S', MC_CHOICE, "S", "[Select]",
+		    menu_init_binding(km, 'S', MC_CHOICE, "S", "[]",
 				      THREE_KEY);
 		}
 		else
@@@@ -2657,7 +2657,7 @@@@
 		 */
 		if(entry_is_clickable(as.top_ent+as.cur_row) &&
 		   !entry_is_clickable_title(as.top_ent+as.cur_row)){
-		    menu_init_binding(km, '>', MC_EXPAND, ">", "Expand",
+		    menu_init_binding(km, '>', MC_EXPAND, ">", "i}",
 				      SENDTO_KEY);
 		    menu_add_binding(km, '.', MC_EXPAND);
 		    if(F_ON(F_ARROW_NAV,ps))
@@@@ -2667,12 +2667,12 @@@@
 		  clrbitn(SENDTO_KEY, bitmap);
 
 		if(cur_is_open() && as.checkboxes){
-		    menu_init_binding(km, 'X', MC_TOGGLE, "X", "Set/Unset",
+		    menu_init_binding(km, 'X', MC_TOGGLE, "X", "]w/Ѱ]w",
 				      DELETE_KEY);
 
 		}
 		else if(cur_is_open() && listmode_ok){
-		    menu_init_binding(km, 'L', MC_LISTMODE, "L", "ListMode",
+		    menu_init_binding(km, 'L', MC_LISTMODE, "L", "CҦ",
 				      DELETE_KEY);
 		}
 		else
@@@@ -2689,7 +2689,7 @@@@
 		 * reasonable function call.
 		 */
 		km->keys[OTHER_KEY].name       = "O";
-		km->keys[OTHER_KEY].label      = "OTHER CMDS";
+		km->keys[OTHER_KEY].label      = "LRO";
 		km->keys[OTHER_KEY].bind.cmd   = MC_OTHER;
 		km->keys[OTHER_KEY].bind.ch[0] = 'O';
 		km->keys[OTHER_KEY].bind.nch   = 1;
@@@@ -2708,13 +2708,13 @@@@
 		    if(F_OFF(F_EXPANDED_DISTLISTS,ps) &&
 		       entry_is_listent(as.top_ent+as.cur_row)){
 			cmd = MC_UNEXPAND;
-			menu_init_binding(km, '<', cmd, "<", "Unexpand",
+			menu_init_binding(km, '<', cmd, "<", "_i}",
 					  TWO_KEY);
 			KS_OSDATASET(&km->keys[TWO_KEY], KS_NONE);
 		    }
 		    else{
 			cmd = MC_MAIN;
-			menu_init_binding(km, 'M', cmd, "<", "Main Menu",
+			menu_init_binding(km, 'M', cmd, "<", "D",
 					  TWO_KEY);
 			KS_OSDATASET(&km->keys[TWO_KEY], KS_MAINMENU);
 		    }
@@@@ -2723,11 +2723,11 @@@@
 			/*
 			 * Add or delete entries from this address book.
 			 */
-			menu_init_binding(km, '@@', MC_ADD, "@@", "AddNew",
+			menu_init_binding(km, '@@', MC_ADD, "@@", "sW",
 					  ADD_KEY);
-			menu_init_binding(km, 'D', MC_DELETE, "D", "Delete",
+			menu_init_binding(km, 'D', MC_DELETE, "D", "R",
 					  DELETE_KEY);
-			menu_init_binding(km, 'C', MC_COMPOSE, "C", "ComposeTo",
+			menu_init_binding(km, 'C', MC_COMPOSE, "C", "s",
 					  SENDTO_KEY);
 			KS_OSDATASET(&km->keys[SENDTO_KEY], KS_COMPOSER);
 			menu_init_binding(km, '#', MC_ROLE, "#", "Role",
@@@@ -2756,7 +2756,7 @@@@
 		    if(F_OFF(F_EXPANDED_DISTLISTS,ps) &&
 		       entry_is_listent(as.top_ent+as.cur_row)){
 			cmd = MC_UNEXPAND;
-			menu_init_binding(km, '<', cmd, "<", "Unexpand",
+			menu_init_binding(km, '<', cmd, "<", "_i}",
 					  TWO_KEY);
 			KS_OSDATASET(&km->keys[TWO_KEY], KS_NONE);
 		    }
@@@@ -2764,12 +2764,12 @@@@
 			if(as.n_addrbk > 1 || as.n_serv){
 			    cmd = MC_POPUP;
 			    menu_init_binding(km, '<', cmd, "<",
-					      "AddressBkList", TWO_KEY);
+					      "a}ïC", TWO_KEY);
 			    KS_OSDATASET(&km->keys[TWO_KEY], KS_NONE);
 			}
 			else{
 			    cmd = MC_MAIN;
-			    menu_init_binding(km, 'M', cmd, "<", "Main Menu",
+			    menu_init_binding(km, 'M', cmd, "<", "D",
 					      TWO_KEY);
 			    KS_OSDATASET(&km->keys[TWO_KEY], KS_MAINMENU);
 			}
@@@@ -2779,9 +2779,9 @@@@
 			/*
 			 * Add or delete entries from this address book.
 			 */
-			menu_init_binding(km, '@@', MC_ADD, "@@", "AddNew",
+			menu_init_binding(km, '@@', MC_ADD, "@@", "sW",
 					  ADD_KEY);
-			menu_init_binding(km, 'D', MC_DELETE, "D", "Delete",
+			menu_init_binding(km, 'D', MC_DELETE, "D", "R",
 					  DELETE_KEY);
 		    }
 		    else{
@@@@ -2791,14 +2791,14 @@@@
 
 		    /* Find someplace to put Main Menu command */
 		    if(cmd == MC_POPUP){
-			menu_init_binding(km, 'M', MC_MAIN, "M", "Main Menu",
+			menu_init_binding(km, 'M', MC_MAIN, "M", "D",
 					  SECONDARY_MAIN_KEY);
 			KS_OSDATASET(&km->keys[SECONDARY_MAIN_KEY],KS_MAINMENU);
 		    }
 		    else
 		      clrbitn(SECONDARY_MAIN_KEY, bitmap);
 
-		    menu_init_binding(km, 'C', MC_COMPOSE, "C", "ComposeTo",
+		    menu_init_binding(km, 'C', MC_COMPOSE, "C", "s",
 				      SENDTO_KEY);
 		    KS_OSDATASET(&km->keys[SENDTO_KEY], KS_COMPOSER);
 		    menu_init_binding(km, '#', MC_ROLE, "#", "Role",
@@@@ -2810,7 +2810,7 @@@@
 		     * non-selection mode.
 		     */
 		    cmd = MC_MAIN;
-		    menu_init_binding(km, 'M', cmd, "<", "Main Menu",
+		    menu_init_binding(km, 'M', cmd, "<", "D",
 				      TWO_KEY);
 		    KS_OSDATASET(&km->keys[TWO_KEY], KS_MAINMENU);
 
@@@@ -2850,10 +2850,10 @@@@
 		  cmd = MC_VIEW_ENTRY;
 
 		menu_init_binding(km, '>', cmd, ">",
-				  cmd == MC_EXPAND ? "[Expand]" :
-				    cmd == MC_QUERY_SERV ? "[Search]" :
-				      cur_is_open() ? "[View/Update]"
-						    : "[ViewAbook]",
+				  cmd == MC_EXPAND ? "[i}]" :
+				    cmd == MC_QUERY_SERV ? "[jM]" :
+				      cur_is_open() ? "[˵/s]"
+						    : "[˵a}ï]",
 				  THREE_KEY);
 
 		if(cmd == MC_QUERY_SERV)
@@@@ -2992,13 +2992,13 @@@@
 	    }
 
 	    if(as.config)
-	      helper(gAbookHelp, "HELP ON CONFIGURING ADDRESS BOOKS",
+	      helper(gAbookHelp, "]wa}ïU",
 		     HLPD_NONE);
 	    else if(are_selecting)
-	      helper(gAbookHelp, "HELP ON ADDRESS BOOK",
+	      helper(gAbookHelp, "a}ïU",
 		     HLPD_SIMPLE | HLPD_NEWWIN);
 	    else	/* general maintenance screen */
-	      helper(gAbookHelp, "HELP ON ADDRESS BOOK", HLPD_NONE);
+	      helper(gAbookHelp, "a}ïU", HLPD_NONE);
 
 	    /*
 	     * Helper() may have a Main Menu key. If user types that
@@@@ -3072,7 +3072,7 @@@@
 	    }
 	    else
 	      q_status_message(SM_ORDER | SM_DING, 3, 4,
-			       "Can't happen in MC_UNEXPAND");
+			       "Lkb MC_UNEXPAND ɵo");
 
 	    break;
 
@@@@ -3108,7 +3108,7 @@@@
 	    }
 	    else
 	      q_status_message(SM_ORDER | SM_DING, 3, 4,
-			       "Can't happen in MC_POPUP");
+			       "Lkb MC_POPUP ɵo");
 
 	    break;
 
@@@@ -3179,11 +3179,11 @@@@
 		}
 		else if(dlc_to_flush->type == DlcTitleNoPerm)
 	          q_status_message(SM_ORDER, 0, 4,
-				   "Cannot access address book.");
+				   "Lksa}ïC");
 	    }
 	    else
 	      q_status_message(SM_ORDER | SM_DING, 3, 4,
-			       "Can't happen in MC_OPENABOOK");
+			       "Lkb MC_OPENABOOK ɵo");
 
 	    break;
 
@@@@ -3229,7 +3229,7 @@@@
 	    }
 	    else
 	      q_status_message(SM_ORDER | SM_DING, 3, 4,
-			       "Can't happen in MC_EXPAND");
+			       "Lkb MC_EXPAND ɵo");
 
 	    break;
 
@@@@ -3241,7 +3241,7 @@@@
               /* Select an entry to mail to or a nickname to add to */
 	      if(!any_addrs_avail(as.top_ent+as.cur_row)){
 	          q_status_message(SM_ORDER | SM_DING, 0, 4,
-	   "No entries in address book. Use ExitSelect to leave address books");
+	   "a}ï䤣󶵥. ХH }(E) }");
 	          break;
 	      }
 
@@@@ -3263,7 +3263,7 @@@@
 		  }
 		  else if(as.checkboxes && checkedn <= 0){
 		      q_status_message(SM_ORDER, 0, 1,
-			"Use \"X\" to mark addresses or lists");
+			"ϥ \"X\" аOa}ΦC");
 		      break;
 		  }
 		  else if(as.checkboxes){
@@@@ -3347,7 +3347,7 @@@@
 		      if(selecting_mult_nicks){
 			if(dl->type != ListHead && style == SelectAddrLccCom){
 			    q_status_message(SM_ORDER, 0, 4,
-	  "You may only select lists for lcc, use bcc for other addresses");
+	  "ȯ lcc C, La}Х bcc");
 			    break;
 			}
 			else{
@@@@ -3422,16 +3422,16 @@@@
 		  if(entry_is_clickable(as.top_ent+as.cur_row))
 		    clickable_warning(as.top_ent+as.cur_row);
 		  else if(entry_is_askserver(as.top_ent+as.cur_row))
-	            q_status_message(SM_ORDER, 3, 4, "Use select to select an address or addresses from address books");
+	            q_status_message(SM_ORDER, 3, 4, "ϥΡuܡvӿܦa}ïa}");
 		  else
-	            q_status_message(SM_ORDER, 3, 4, "No address selected");
+	            q_status_message(SM_ORDER, 3, 4, "|ܥa}");
 
 	          break;
 	      }
 	    }
 	    else
 	      q_status_message(SM_ORDER | SM_DING, 3, 4,
-			       "Can't happen in MC_CHOICE");
+			       "Lkb MC_CHOICE ɵo");
 
 	    break;
 
@@@@ -3455,7 +3455,7 @@@@
 	    if(adrbk_check_all_validity_now()){
 		if(resync_screen(pab, style, checkedn)){
 		    q_status_message(SM_ORDER | SM_DING, 3, 4,
-		     "Address book changed. AddNew cancelled. Try again.");
+		     "a}ïQܤFFsWCЭդ@@MC");
 		    ps->mangled_screen = 1;
 		    break;
 		}
@@@@ -3470,7 +3470,7 @@@@
 	    dprint(9, (debugfile,
 		       "Calling edit_entry to add entry manually\n"));
 	    edit_entry(pab->address_book, (AdrBk_Entry *)NULL, NO_NEXT,
-		       NotSet, 0, &warped, "add");
+		       NotSet, 0, &warped, "sW");
 
 	    /*
 	     * Warped means we got plopped down somewhere in the display
@@@@ -3615,7 +3615,7 @@@@
 		    }
 		    else{
 			q_status_message1(SM_ORDER|SM_DING, 0, 4,
-					  "Missing \"}\" in config: %s", q);
+					  "]wɤʥF \"}\"G%s", q);
 			if(nick)
 			  fs_give((void **)&nick);
 			if(file)
@@@@ -3650,7 +3650,7 @@@@
 		ps->mangled_screen = 1;
 	    }
 	    else
-              q_status_message(SM_ORDER, 0, 4, "Not a changeable line");
+              q_status_message(SM_ORDER, 0, 4, "iQ諸@@");
 
 	    break;
 
@@@@ -3658,7 +3658,7 @@@@
             /*---------- Delete an address book -------------------*/
 	  case MC_DELABOOK:
 	    if(as.n_addrbk == 0){
-                q_status_message(SM_ORDER, 0, 4, "Nothing to delete");
+                q_status_message(SM_ORDER, 0, 4, "SiQR");
                 break;
 	    }
 
@@@@ -3729,7 +3729,7 @@@@
 		start_disp = 0;
 		ps->mangled_body = 1;
 		ps->mangled_footer = 1;
-		q_status_message(SM_ORDER, 0, 3, "Address book deleted");
+		q_status_message(SM_ORDER, 0, 3, "a}ïwQR");
 	    }
 	    else{
 		if(err){
@@@@ -3747,7 +3747,7 @@@@
 	  case MC_SHUFFLE:
 	    if(entry_is_addkey(as.top_ent+as.cur_row)){
                 q_status_message(SM_ORDER, 0, 4,
-				 "Highlight entry you wish to shuffle");
+				 "ХܷQn㪺");
                 break;
 	    }
 
@@@@ -3820,8 +3820,8 @@@@
 
 	    q_status_message(SM_ORDER, 0, 3,
 			     msg ? msg :
-			      (ret < 0) ? "Shuffle failed" :
-			       "Address books shuffled");
+			      (ret < 0) ? "㥢" :
+			       "a}ïw");
 	    if(ret < 0)
 	      dprint(5, (debugfile, "addrbook shuffle failed: %s\n",
 		     msg ? msg : "?"));
@@@@ -3848,7 +3848,7 @@@@
 
 		if(new_top_ent == as.top_ent ||
 		   (as.cur_row + (as.top_ent-new_top_ent) > as.l_p_page - 1)){
-		    q_status_message(SM_INFO, 0, 1, "Already on first line.");
+		    q_status_message(SM_INFO, 0, 1, "wgbĤ@@FC");
 		}
 		else{
 		    as.cur_row += (as.top_ent - new_top_ent);
@@@@ -3906,7 +3906,7 @@@@
 
 		if(new_end_line - as.top_ent <= as.l_p_page - 1 ||
 		   as.cur_row - (new_end_line-as.top_ent-(as.l_p_page-1)) < 0){
-		    q_status_message(SM_INFO, 0, 1, "Already on last line.");
+		    q_status_message(SM_INFO, 0, 1, "wgb̫@@FC");
 		}
 		else{
 		    as.cur_row -= (new_end_line-as.top_ent-(as.l_p_page-1));
@@@@ -3994,7 +3994,7 @@@@
 #endif
 			  default:
 			    q_status_message(SM_INFO, 0, 1,
-					     "Can't happen in MC_MOUSE");
+					     "Lkb MC_MOUSE ɵo");
 			    break;
 			}
 		    }
@@@@ -4101,7 +4101,7 @@@@
 		    break;
 
 		if(as.top_ent == new_top_ent && as.cur_row == (fl-as.top_ent)){
-		    q_status_message(SM_INFO, 0, 1, "Already on first page.");
+		    q_status_message(SM_INFO, 0, 1, "wgbĤ@@FC");
 		    break;
 		}
 
@@@@ -4137,7 +4137,7 @@@@
 			   as.cur_row -
 			       (new_end_line-as.top_ent-(as.l_p_page-1)) < 0){
 			    q_status_message(SM_INFO, 0, 1,
-					     "Already on last page.");
+					     "wgb̫@@FC");
 			}
 			else{
 			    as.cur_row -=
@@@@ -4186,14 +4186,14 @@@@
 	    if(adrbk_check_all_validity_now()){
 		if(resync_screen(pab, style, checkedn)){
 		    q_status_message(SM_ORDER | SM_DING, 3, 4,
-			  "Address book changed. Delete cancelled. Try again.");
+			  "a}ïQܤFFRCЭդ@@MC");
 		    ps->mangled_screen = 1;
 		    break;
 		}
 	    }
 
 	    if(!any_addrs_avail(as.top_ent+as.cur_row)){
-                q_status_message(SM_ORDER, 0, 4, "No entries to delete");
+                q_status_message(SM_ORDER, 0, 4, "SiѧR");
                 break;
 	    }
 
@@@@ -4255,7 +4255,7 @@@@
 	  case MC_TOGGLE:
 togglex:
 	    if(!any_addrs_avail(as.top_ent+as.cur_row)){
-                q_status_message(SM_ORDER, 0, 4, "No entries to select");
+                q_status_message(SM_ORDER, 0, 4, "SiѧR");
                 break;
 	    }
 
@@@@ -4274,10 +4274,10 @@@@
 
 		if(style == SelectAddrLccCom && dl->type == ListEnt)
 		  q_status_message(SM_ORDER, 0, 4,
-	  "You may only select whole lists for lcc");
+	  "ȯܾӦC lcc");
 		else if(style == SelectAddrLccCom && dl->type != ListHead)
 		  q_status_message(SM_ORDER, 0, 4,
-	  "You may only select lists for lcc, use bcc for personal entries");
+	  "ȯܦC lccAӤHؽХ bcc");
 		else if(dl->type == ListHead || dl->type == Simple){
                     current_changed_flag++;
 		    if(entry_is_checked(pab->address_book->checks,
@@@@ -4294,11 +4294,11 @@@@
 		}
 		else
 		  q_status_message(SM_ORDER, 0, 4,
-      "You may not select list members, only whole lists or personal entries");
+      "LkܦCAȯܾӦCέӤH");
 	    }
 	    else
               q_status_message(SM_ORDER, 0, 4,
-			       "You may only select addresses or lists");
+			       "ȯܦa}ΦC");
 
             break;
 
@@@@ -4316,7 +4316,7 @@@@
 	    ps->mangled_body = 1;
 	    start_disp  = 0;
             q_status_message(SM_ORDER, 0, 4,
-		  "Use \"X\" to select addresses or lists");
+		  "ϥ \"X\" аOa}ΦC");
             break;
 
 
@@@@ -4342,13 +4342,13 @@@@
 	    if(!directory_ok){
                 q_status_message(SM_ORDER, 0, 4,
 				 (style == SelectAddrLccCom)
-				    ? "Can't search server for Lcc"
-				    : "Can't search server from here");
+				    ? "LkѦAjM Lcc"
+				    : "LkѦjMA");
                 break;
 	    }
 	    else if(as.checkboxes){
                 q_status_message(SM_ORDER, 0, 4,
-				 "Can't search server when using ListMode");
+				 "ϥ ListMode ɵLkjMA");
                 break;
 	    }
 
@@@@ -4403,14 +4403,14 @@@@
             /*----- Select entries to work on --*/
 	  case MC_SELECT:
 	    if(!any_addrs_avail(as.top_ent+as.cur_row)){
-                q_status_message(SM_ORDER, 0, 4, "No entries to select");
+                q_status_message(SM_ORDER, 0, 4, "Siѿܪ");
                 break;
 	    }
 
 	    if(!cur_is_open()){
 		if(entry_is_askserver(as.top_ent+as.cur_row))
 		  q_status_message(SM_ORDER, 0, 4,
-	   "Select is only available from within an expanded address book");
+	   "ȯbi}᪺a}ï");
 		else
 		  clickable_warning(as.top_ent+as.cur_row);
 
@@@@ -4443,7 +4443,7 @@@@
             /*----------- Select current entry ----------*/
 	  case MC_SELCUR:
 	    if(!any_addrs_avail(as.top_ent+as.cur_row)){
-                q_status_message(SM_ORDER, 0, 4, "No entries to select");
+                q_status_message(SM_ORDER, 0, 4, "Siѿܪ");
                 break;
 	    }
 
@@@@ -4504,7 +4504,7 @@@@
 				dlc_restart = *dlc;
 				as.zoomed = 0;
 				q_status_message(SM_ORDER, 0, 2,
-				  "Zoom Mode is now off, no entries selected");
+				  "YҦثeAASQܪ");
 
 				warp_to_dlc(&dlc_restart, 0L);
 				/* put current entry in middle of screen */
@@@@ -4571,11 +4571,11 @@@@
 		}
 		else
 		  q_status_message(SM_ORDER, 0, 4,
-      "You may not select list members, only whole lists or personal entries");
+      "LkܦCAȯܾӦCέӤH");
 	    }
 	    else
               q_status_message(SM_ORDER, 0, 4,
-			       "You may only select addresses or lists");
+			       "ȯܦa}ΦC");
 
             break;
 
@@@@ -4588,7 +4588,7 @@@@
 						 : NULL,
 		      &start_disp);
 	    else{
-		q_status_message(SM_ORDER, 0, 2, "Zoom Mode is now off");
+		q_status_message(SM_ORDER, 0, 2, "{bYҦ");
 		ab_unzoom(&start_disp);
 	    }
 
@@@@ -4630,7 +4630,7 @@@@
 	    }
 	    else
 	      q_status_message(SM_ORDER, 0, 2,
-				   "No selected entries to apply command to");
+				   "SwܪإiѮMΩRO");
 
             break;
 
@@@@ -4676,7 +4676,7 @@@@
 	    /*------ Copy entries into an abook ----*/
 	  case MC_SAVE:
 	    if(!any_addrs_avail(as.top_ent+as.cur_row)){
-                q_status_message(SM_ORDER, 0, 4, "No entries to save");
+                q_status_message(SM_ORDER, 0, 4, "SiѦsJ");
                 break;
 	    }
 
@@@@ -4698,7 +4698,7 @@@@
 	    /*------ Forward an entry in mail -----------*/
 	  case MC_FORWARD:
 	    if(!any_addrs_avail(as.top_ent+as.cur_row)){
-                q_status_message(SM_ORDER, 0, 4, "No entries to forward");
+                q_status_message(SM_ORDER, 0, 4, "SiH");
                 break;
 	    }
 
@@@@ -4713,14 +4713,14 @@@@
 	    }
 
 	    if(!is_addr(as.top_ent+as.cur_row)){
-                q_status_message(SM_ORDER, 0, 4, "Nothing to forward");
+                q_status_message(SM_ORDER, 0, 4, "SFiHH");
                 break;
 	    }
 
 	    dl = dlist(as.top_ent+as.cur_row);
 	    if(dl->type != ListHead && dl->type != Simple){
 		q_status_message(SM_ORDER, 0, 4,
-		    "Can only forward whole entries");
+		    "ȯHӦC");
 		break;
 	    }
 
@@@@ -4752,18 +4752,18 @@@@
 	  case MC_UNKNOWN:
 	    if(c == 'e' && !are_selecting){
 		q_status_message(SM_ORDER | SM_DING, 0, 2,
-	  "Command \"E\" not defined.  Use \"View/Update\" to edit an entry");
+	  "\"E\" oөRO|Qwq.  Шϥ \"˵/s\" sﶵ");
 		break;
 	    }
 	    else if(c == 's'
 	      && !(are_selecting || entry_is_clickable(as.top_ent+as.cur_row))){
 		q_status_message(SM_ORDER | SM_DING, 0, 2,
-	    "Command \"S\" not defined.  Use \"AddNew\" to create a list");
+	    "\"S\" oөRO|Qwq.  Шϥ \"sW\" إߦC");
 		break;
 	    }
 	    else if(c == 'z' && !are_selecting){
 		q_status_message(SM_ORDER | SM_DING, 0, 2,
-	 "Command \"Z\" not defined.  Use \"View/Update\" to add to a list");
+	 "\"Z\" oөRO|Qwq.  Шϥ \"˵/s\" sWܦC");
 		break;
 	    }
 	    /* else, fall through */
@@@@ -4801,7 +4801,7 @@@@
     as.zoomed = 1;
 
     if(as.selections){
-	q_status_message(SM_ORDER, 0, 2, "Zoom Mode is now on");
+	q_status_message(SM_ORDER, 0, 2, "{b}YҦ");
 	if(cur_is_open()){
 	    dl = dlist(as.top_ent+as.cur_row);
 	    if((dl->type == ListHead ||
@@@@ -4849,7 +4849,7 @@@@
     }
     else{
 	as.zoomed = 0;
-	q_status_message(SM_ORDER, 0, 2, "No selected entries to zoom on");
+	q_status_message(SM_ORDER, 0, 2, "Swܪإiѩj");
     }
 }
 
@@@@ -4910,7 +4910,7 @@@@
     char      *name;
 {
     q_status_message2(SM_ORDER | (bell ? SM_DING : 0), 0, 4,
-		      "AddressBook%s%s is Read Only",
+		      "a}ï%s%s OŪ",
 		      name ? " " : "",
 		      name ? name : "");
 }
@@@@ -4931,11 +4931,11 @@@@
     dl = dlist(cur_line);
     if(dl->type == NoAbooks)
       q_status_message(SM_ORDER, 0, 4,
-		       "No address books configured, use Setup");
+		       "Sw]wna}ïAХ Setup");
     else if(dl->type == Empty)
-      q_status_message(SM_ORDER, 0, 4, "Address Book is Empty");
+      q_status_message(SM_ORDER, 0, 4, "a}ïOŪ");
     else
-      q_status_message(SM_ORDER, 0, 4, "Distribution List is Empty");
+      q_status_message(SM_ORDER, 0, 4, "COŪ");
 }
 
 
@@@@ -4952,9 +4952,9 @@@@
     register AddrScrn_Disp *dl;
 
     dl = dlist(cur_line);
-    q_status_message1(SM_ORDER, 0, 4, "%s not expanded, use \">\" to expand",
-	(dl->type == Title || dl->type == ClickHereCmb) ? "Address Book"
-						        : "Distribution List");
+    q_status_message1(SM_ORDER, 0, 4, "%s Qi}Aϥ \">\" Ӯi}",
+	(dl->type == Title || dl->type == ClickHereCmb) ? "a}ï"
+						        : "C");
 }
 
 
@@@@ -4970,7 +4970,7 @@@@
     char *what;
 {
     q_status_message1(SM_INFO | (bell ? SM_DING : 0), 0, 2,
-		      "Address book %s cancelled", what);
+		      "a}ï%sw", what);
 }
 
 
@@@@ -4980,7 +4980,7 @@@@
 void
 no_tabs_warning()
 {
-    q_status_message(SM_ORDER, 0, 4, "Tabs not allowed in address book");
+    q_status_message(SM_ORDER, 0, 4, "a}ï\\ Tab sb");
 }
 
 
@@@@ -4999,12 +4999,12 @@@@
 {
     int ret = 0;
     static ESCKEY_S opts[] = {
-	{'c', 'c', "C", "ComposeTo"},
-	{'d', 'd', "D", "Delete"},
-	{'%', '%', "%", "Print"},
-	{'f', 'f', "F", "Forward"},
-	{'s', 's', "S", "Save"},
-	{'#', '#', "#", "Role"},
+	{'c', 'c', "C", "s"},
+	{'d', 'd', "D", "R"},
+	{'%', '%', "%", "CL"},
+	{'f', 'f', "F", "H"},
+	{'s', 's', "S", "s"},
+	{'#', '#', "#", ""},
 	{  0, '%',  "",  ""},
 	{-1,   0, NULL, NULL}};
 #define PHANTOM_PRINT 6
@@@@ -5014,7 +5014,7 @@@@
 
     opts[PHANTOM_PRINT].ch = (F_ON(F_ENABLE_PRYNT, ps_global)) ? 'y' : -1;
 
-    switch(radio_buttons("APPLY command : ", command_line, opts, 0, 'z',
+    switch(radio_buttons("MΩROG", command_line, opts, 0, 'z',
 			 NO_HELP, RB_NORM)){
       case 'c':
 	ret = ab_compose_to_addr(cur_line, 1, 0);
@@@@ -5041,7 +5041,7 @@@@
 	break;
 
       case 'z':
-	cmd_cancelled("Apply command");
+	cmd_cancelled("MΩRO");
 	break;
     }
 
@@@@ -5063,22 +5063,22 @@@@
     int         *start_disp;
 {
     static ESCKEY_S sel_opts1[] = {
-	{'a', 'a', "A", "unselect All"},
+	{'a', 'a', "A", "Ҧ"},
 	{ 0 , '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}
     };
     static char *sel_pmt1 = "ALTER message selection : ";
     static ESCKEY_S sel_opts2[] = {
-	{'a', 'a', "A", "select All"},
-	{'c', 'c', "C", "select Cur"},
-	{'t', 't', "T", "Text"},
-	{'s', 's', "S", "Status"},
+	{'a', 'a', "A", "ܥ"},
+	{'c', 'c', "C", "ܥثe"},
+	{'t', 't', "T", "r"},
+	{'s', 's', "S", "A"},
 	{-1, 0, NULL, NULL}
     };
-    static char *sel_pmt2 = "SELECT criteria : ";
+    static char *sel_pmt2 = "ܼзǡG";
     ESCKEY_S      *sel_opts;
     HelpType       help = NO_HELP;
     adrbk_cntr_t   num, ab_count;
@@@@ -5106,8 +5106,8 @@@@
 	    if(dl && (dl->type == ListHead || dl->type == Simple)){
 		sel_opts1[1].label = entry_is_selected(abook->selects,
 						       (a_c_arg_t)dl->elnum)
-					       ? "unselect Cur"
-					       : "select Cur";
+					       ? "ثe"
+					       : "ܥثe";
 		sel_opts1[1].ch = 'c';
 	    }
 	    else
@@@@ -5129,7 +5129,7 @@@@
 
 	      default:
 		q_status_message(SM_ORDER | SM_DING, 3, 3,
-				 "Unsupported Select option");
+				 "|䴩ﶵ");
 		return;
 	    }
 	}
@@@@ -5138,8 +5138,8 @@@@
 	   (dl->type == ListHead || dl->type == Simple)){
 	    sel_opts1[1].label = entry_is_selected(abook->selects,
 						   (a_c_arg_t)dl->elnum)
-					   ? "unselect Cur"
-					   : "select Cur";
+					   ? "ثe"
+					   : "ܥثe";
 	    sel_opts1[1].ch = 'c';
 	}
 	else
@@@@ -5156,7 +5156,7 @@@@
 
 	switch(q){
 	  case 'x':				/* cancel */
-	    cmd_cancelled("Select command");
+	    cmd_cancelled("ܩRO");
 	    break;
 
 	  case 'c':			/* select/unselect current */
@@@@ -5168,7 +5168,7 @@@@
 		if(as.selections == 0 && as.zoomed){
 		    as.zoomed = 0;
 		    q_status_message(SM_ORDER, 0, 2,
-				 "Zoom Mode is now off, no entries selected");
+				 "YҦثeAASQܪ");
 		    do_warp++;
 		}
 		else if(as.zoomed){
@@@@ -5207,17 +5207,17 @@@@
 		if(as.selections == 0 && as.zoomed){
 		    as.zoomed = 0;
 		    q_status_message(SM_ORDER, 0, 2,
-				"Zoom Mode is now off, all entries UNselected");
+				"YҦثeAAҦwܪ");
 		    do_warp++;
 		}
 		else{
 		    char bb[100];
 
-		    sprintf(bb, "%s entries UNselected%s%s%s",
+		    sprintf(bb, "%s ӶسQ%s%s%s",
 			   comatose(prevsel-as.selections),
-			   as.selections ? ", still " : "",
+			   as.selections ? "A " : "",
 			   as.selections ? comatose(as.selections) : "",
-			   as.selections ? " selected in other addrbooks" : "");
+			   as.selections ? " ӶؿܩLa}ï" : "");
 		    q_status_message(SM_ORDER, 0, 2, bb);
 		    if(as.zoomed)
 		      do_beginning++;
@@@@ -5233,7 +5233,7 @@@@
 		    }
 		}
 
-		q_status_message1(SM_ORDER, 0, 2, "All %s entries selected",
+		q_status_message1(SM_ORDER, 0, 2, "wܩҦ %s ",
 				 comatose(ab_count));
 		if(prevsel == 0 && as.selections > 0 &&
 		   !as.zoomed && F_ON(F_AUTO_ZOOM, ps)){
@@@@ -5270,14 +5270,14 @@@@
 		  do_beginning++;
 		else{
 		    as.zoomed = 0;
-		    q_status_message(SM_ORDER, 0, 2, "Zoom Mode is now off");
+		    q_status_message(SM_ORDER, 0, 2, "{bYҦ");
 		    do_warp++;
 		}
 	    }
 	    else
 	      do_warp++;
 
-	    q_status_message1(SM_ORDER, 0, 2, "%s entries now selected",
+	    q_status_message1(SM_ORDER, 0, 2, " %s {bwQ",
 			     comatose(as.selections));
 
 	    break;
@@@@ -5303,7 +5303,7 @@@@
 		    if(as.selections == 0){
 			as.zoomed = 0;
 			q_status_message(SM_ORDER, 0, 2,
-					 "Zoom Mode is now off");
+					 "{bYҦ");
 			do_warp++;
 		    }
 		    else
@@@@ -5322,63 +5322,63 @@@@
 		if(prevsel == as.selections && prevsel > 0){
 		    if(as.selections == 1)
 		      q_status_message(SM_ORDER, 0, 2,
-			    "No change resulted, 1 entry remains selected");
+			    "SɭPܡA@@ӶسQ");
 		    else
 		      q_status_message1(SM_ORDER, 0, 2,
-			    "No change resulted, %s entries remain selected",
+			    "SɭPܡA %s ӶسQ",
 			    comatose(as.selections));
 		}
 		else if(prevsel == 0){
 		    if(as.selections == 1)
 		      q_status_message(SM_ORDER, 0, 2,
-				       "Select matched 1 entry");
+				       "ܲŦX@@Ӷ");
 		    else if(as.selections > 1)
 		      q_status_message1(SM_ORDER, 0, 2,
-				        "Select matched %s entries",
+				        "ܲŦX %s Ӷ",
 				        comatose(as.selections));
 		    else
 		      q_status_message(SM_ORDER, 0, 2,
-				       "Select failed! No entries selected");
+				       "ܥѡIS󶵥سQ");
 		}
 		else if(as.selections == 0){
 		    if(prevsel == 1)
 		      q_status_message(SM_ORDER, 0, 2,
-				    "The single selected entry is UNselected");
+				    "wQܪ@@");
 		    else
 		      q_status_message1(SM_ORDER, 0, 2,
-					"All %s entries UNselected",
+					"Ҧ %s ӶسQ",
 					comatose(prevsel));
 		}
 		else if(narrow){
 		    if(as.selections == 1 && (prevsel-as.selections) == 1)
 		      q_status_message(SM_ORDER, 0, 2,
-			    "1 entry now selected, 1 entry was UNselected");
+			    "@@سQܡA@@سQ");
 		    else if(as.selections == 1)
 		      q_status_message1(SM_ORDER, 0, 2,
-			    "1 entry now selected, %s entries were UNselected",
+			    "@@سQܡA%s ӶسQ",
 			    comatose(prevsel-as.selections));
 		    else if((prevsel-as.selections) == 1)
 		      q_status_message1(SM_ORDER, 0, 2,
-			    "%s entries now selected, 1 entry was UNselected",
+			    "%s ӶسQܡA@@سQ",
 			    comatose(as.selections));
 		    else
 		      q_status_message2(SM_ORDER, 0, 2,
-			"%s entries now selected, %s entries were UNselected",
+			"%s ӶسQܡA%s ӶسQ",
 			comatose(as.selections),
 			comatose(prevsel-as.selections));
 		}
 		else{
 		    if((as.selections-prevsel) == 1)
 		      q_status_message1(SM_ORDER, 0, 2,
-				"1 new entry selected, %s entries now selected",
+				"@@ӷsسQܡAثe %s ӶؤwQ",
 				comatose(as.selections));
 		    else if(as.selections == 1)
 		      q_status_message1(SM_ORDER, 0, 2,
-				"%s new entries selected, 1 entry now selected",
+				"%s ӷsسQܡA@@ӶؤwQ",
 				comatose(as.selections-prevsel));
 		    else
 		      q_status_message2(SM_ORDER, 0, 2,
-			    "%s new entries selected, %s entries now selected",
+			    "%s ӷsسQܡAثe %s ӶؤwQ",
 			    comatose(as.selections-prevsel),
 			    comatose(as.selections));
 		}
@@@@ -5388,17 +5388,17 @@@@
 
 	  default :
 	    q_status_message(SM_ORDER | SM_DING, 3, 3,
-			     "Unsupported Select option");
+			     "|䴩ﶵ");
 	    break;
 	}
     }
     else{
 	if(F_ON(F_CMBND_ABOOK_DISP,ps_global))
 	  q_status_message(SM_ORDER | SM_DING, 3, 3,
-	   "Select is only available from within an expanded address book");
+	   "Ȥ䴩ۮi}a}ï");
 	else
 	  q_status_message(SM_ORDER | SM_DING, 3, 3,
-	   "Select is only available when viewing an individual address book");
+	   "ܶȯb˵ӤHa}ïɨϥ");
 
 	return;
     }
@@@@ -5457,11 +5457,11 @@@@
     int    narrow;
 {
     static ESCKEY_S ab_sel_type_opt[] = {
-	{'s', 's', "S", "Simple"},
-	{'l', 'l', "L", "List"},
+	{'s', 's', "S", "²"},
+	{'l', 'l', "L", "C"},
 	{-1, 0, NULL, NULL}
     };
-    static char *ab_sel_type = "Select Lists or Simples (non Lists) ? ";
+    static char *ab_sel_type = "ܦC²(LC)H";
     int          type;
     adrbk_cntr_t num, ab_count;
 
@@@@ -5479,7 +5479,7 @@@@
 	break;
 
       case 'x':
-	cmd_cancelled("Select");
+	cmd_cancelled("");
 	return -1;
 
       default:
@@@@ -5599,7 +5599,7 @@@@
     }
 
     if(type == 'x' || r == 'x'){
-	cmd_cancelled("Select");
+	cmd_cancelled("");
 	return -1;
     }
 
@@@@ -5682,7 +5682,7 @@@@
 	break;
 
       default:
-	q_status_message(SM_ORDER | SM_DING, 3, 3, "Unknown type");
+	q_status_message(SM_ORDER | SM_DING, 3, 3, "A");
 	return(err);
     }
 
@@@@ -5801,18 +5801,18 @@@@
     new_top_ent = NO_LINE;
 
     if(rc == -2)
-      cancel_warning(NO_DING, "search");
+      cancel_warning(NO_DING, "jM");
 
     else if(rc == -1)
-      q_status_message(SM_ORDER, 0, 4, "Word not found");
+      q_status_message(SM_ORDER, 0, 4, "䤣Ӧr");
 
     else if(rc == 0){  /* search succeeded */
 
 	if(wrapped == 1)
-	  q_status_message(SM_INFO, 0, 2, "Search wrapped to beginning");
+	  q_status_message(SM_INFO, 0, 2, "qYjM");
 	else if(wrapped == 2)
 	  q_status_message(SM_INFO, 0, 2,
-			   "Current line contains the only match");
+			   "ثeoȥ]tߤ@@ŦXؼ");
 
 	/* know match is on the same page */
 	if(!*warped &&
@@@@ -6454,7 +6454,7 @@@@
 
     dprint(7, (debugfile, "- search_book -\n"));
 
-    sprintf(prompt, "Word to search for [%s]: ", search_string);
+    sprintf(prompt, "jMr [%s]: ", search_string);
     help              = NO_HELP;
     nsearch_string[0] = '\0';
 
@@@@ -6466,12 +6466,12 @@@@
     ekey[1].ch    = ctrl('Y');
     ekey[1].rval  = 10;
     ekey[1].name  = "^Y";
-    ekey[1].label = "First Adr";
+    ekey[1].label = "Ĥ@@Ӧa}";
 
     ekey[2].ch    = ctrl('V');
     ekey[2].rval  = 11;
     ekey[2].name  = "^V";
-    ekey[2].label = "Last Adr";
+    ekey[2].label = "̫@@Ӧa}";
 
     ekey[3].ch    = -1;
 
@@@@ -6488,11 +6488,11 @@@@
 	    warp_to_beginning();  /* go to top of addrbooks */
 	    if((nl=first_selectable_line(0L)) != NO_LINE){
 		*new_line = nl;
-		q_status_message(SM_INFO, 0, 2, "Searched to first entry");
+		q_status_message(SM_INFO, 0, 2, "jMܲĤ@@Ӷ");
 		return 0;
 	    }
 	    else{
-		q_status_message(SM_INFO, 0, 2, "No entries");
+		q_status_message(SM_INFO, 0, 2, "S󶵥");
 		return -1;
 	    }
 	}
@@@@ -6501,11 +6501,11 @@@@
 	    warp_to_end();  /* go to bottom */
 	    if((nl=first_selectable_line(0L)) != NO_LINE){
 		*new_line = nl;
-		q_status_message(SM_INFO, 0, 2, "Searched to last entry");
+		q_status_message(SM_INFO, 0, 2, "jM̲ܳ׶");
 		return 0;
 	    }
 	    else{
-		q_status_message(SM_INFO, 0, 2, "No entries");
+		q_status_message(SM_INFO, 0, 2, "S󶵥");
 		return -1;
 	    }
 	}
@


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 2
a2 2
--- pine/addrbook.c.orig	Tue Feb 23 16:21:22 1999
+++ pine/addrbook.c	Tue Feb 23 18:02:45 1999
d94 1
a94 1
 	    (debugfile, "RESETTING address book... addr_book_compose_oneaddr!\n"));
d105 1
a105 1
@@@@ -1803,7 +1803,7 @@@@
d114 1
a114 1
@@@@ -1812,7 +1812,7 @@@@
d123 1
a123 1
@@@@ -1847,7 +1847,7 @@@@
d132 1
a132 1
@@@@ -1860,7 +1860,7 @@@@
d141 1
a141 1
@@@@ -1895,7 +1895,7 @@@@
d150 1
a150 1
@@@@ -1904,7 +1904,7 @@@@
d159 1
a159 1
@@@@ -1937,7 +1937,7 @@@@
d168 1
a168 1
@@@@ -1946,7 +1946,7 @@@@
d177 1
a177 1
@@@@ -1978,7 +1978,7 @@@@
d186 1
a186 1
@@@@ -1987,7 +1987,7 @@@@
d195 1
a195 1
@@@@ -2023,7 +2023,7 @@@@
d204 1
a204 1
@@@@ -2038,7 +2038,7 @@@@
d213 1
a213 1
@@@@ -2071,7 +2071,7 @@@@
d222 1
a222 1
@@@@ -2080,7 +2080,7 @@@@
d231 1
a231 1
@@@@ -2103,8 +2103,8 @@@@
d242 1
a242 1
@@@@ -2127,10 +2127,10 @@@@
d257 1
a257 1
@@@@ -2259,7 +2259,7 @@@@
d266 1
a266 1
@@@@ -2267,7 +2267,7 @@@@
d275 1
a275 1
@@@@ -2277,7 +2277,7 @@@@
d284 1
a284 1
@@@@ -2422,10 +2422,10 @@@@
d298 1
a298 1
@@@@ -2490,7 +2490,7 @@@@
d307 1
a307 1
@@@@ -2503,22 +2503,22 @@@@
d337 1
a337 1
@@@@ -2531,7 +2531,7 @@@@
d346 1
a346 1
@@@@ -2551,8 +2551,8 @@@@
d357 1
a357 1
@@@@ -2563,16 +2563,16 @@@@
d377 1
a377 1
@@@@ -2584,7 +2584,7 @@@@
d386 1
a386 1
@@@@ -2592,7 +2592,7 @@@@
d395 1
a395 1
@@@@ -2600,7 +2600,7 @@@@
d404 1
a404 1
@@@@ -2613,7 +2613,7 @@@@
d413 1
a413 1
@@@@ -2623,12 +2623,12 @@@@
d428 1
a428 1
@@@@ -2645,7 +2645,7 @@@@
d437 1
a437 1
@@@@ -2664,13 +2664,13 @@@@
d453 1
a453 1
@@@@ -2679,11 +2679,11 @@@@
d467 2
a468 2
 		    }
@@@@ -2709,7 +2709,7 @@@@
d477 1
a477 1
@@@@ -2717,12 +2717,12 @@@@
d492 1
a492 1
@@@@ -2732,9 +2732,9 @@@@
d504 1
a504 1
@@@@ -2744,14 +2744,14 @@@@
d520 2
a521 2
 		}
@@@@ -2761,7 +2761,7 @@@@
d530 1
a530 1
@@@@ -2800,10 +2800,10 @@@@
d545 1
a545 1
@@@@ -2941,13 +2941,13 @@@@
d562 1
a562 1
@@@@ -3021,7 +3021,7 @@@@
d571 1
a571 1
@@@@ -3057,7 +3057,7 @@@@
d580 1
a580 1
@@@@ -3128,11 +3128,11 @@@@
d594 1
a594 1
@@@@ -3178,7 +3178,7 @@@@
d603 1
a603 1
@@@@ -3190,7 +3190,7 @@@@
d612 1
a612 1
@@@@ -3212,7 +3212,7 @@@@
d621 1
a621 1
@@@@ -3296,7 +3296,7 @@@@
d630 1
a630 1
@@@@ -3358,16 +3358,16 @@@@
d650 1
a650 1
@@@@ -3391,7 +3391,7 @@@@
d659 1
a659 1
@@@@ -3406,7 +3406,7 @@@@
d668 1
a668 1
@@@@ -3551,7 +3551,7 @@@@
d677 1
a677 1
@@@@ -3586,7 +3586,7 @@@@
d686 1
a686 1
@@@@ -3594,7 +3594,7 @@@@
d695 1
a695 1
@@@@ -3665,7 +3665,7 @@@@
d704 1
a704 1
@@@@ -3683,7 +3683,7 @@@@
d713 1
a713 1
@@@@ -3756,8 +3756,8 @@@@
d724 1
a724 1
@@@@ -3784,7 +3784,7 @@@@
d733 1
a733 1
@@@@ -3842,7 +3842,7 @@@@
d742 1
a742 1
@@@@ -3930,7 +3930,7 @@@@
d751 1
a751 1
@@@@ -4037,7 +4037,7 @@@@
d760 1
a760 1
@@@@ -4073,7 +4073,7 @@@@
d769 1
a769 1
@@@@ -4122,14 +4122,14 @@@@
d786 1
a786 1
@@@@ -4191,7 +4191,7 @@@@
d795 1
a795 1
@@@@ -4210,10 +4210,10 @@@@
d808 1
a808 1
@@@@ -4230,11 +4230,11 @@@@
d822 1
a822 1
@@@@ -4252,7 +4252,7 @@@@
d831 1
a831 1
@@@@ -4272,13 +4272,13 @@@@
d848 1
a848 1
@@@@ -4333,14 +4333,14 @@@@
d865 1
a865 1
@@@@ -4373,7 +4373,7 @@@@
d874 1
a874 1
@@@@ -4434,7 +4434,7 @@@@
d883 1
a883 1
@@@@ -4501,11 +4501,11 @@@@
d897 1
a897 1
@@@@ -4518,7 +4518,7 @@@@
d906 1
a906 1
@@@@ -4560,7 +4560,7 @@@@
d915 1
a915 1
@@@@ -4606,7 +4606,7 @@@@
d924 1
a924 1
@@@@ -4628,7 +4628,7 @@@@
d933 1
a933 1
@@@@ -4643,14 +4643,14 @@@@
d950 1
a950 1
@@@@ -4682,18 +4682,18 @@@@
d972 1
a972 1
@@@@ -4731,7 +4731,7 @@@@
d981 1
a981 1
@@@@ -4779,7 +4779,7 @@@@
d990 1
a990 1
@@@@ -4840,7 +4840,7 @@@@
d999 1
a999 1
@@@@ -4861,11 +4861,11 @@@@
d1014 1
a1014 1
@@@@ -4882,9 +4882,9 @@@@
d1027 1
a1027 1
@@@@ -4900,7 +4900,7 @@@@
d1036 1
a1036 1
@@@@ -4910,7 +4910,7 @@@@
d1045 1
a1045 1
@@@@ -4929,11 +4929,11 @@@@
d1054 1
d1060 1
d1063 2
d1066 1
a1066 3
@@@@ -4942,7 +4942,7 @@@@
 
     opts[5].ch = (F_ON(F_ENABLE_PRYNT, ps_global)) ? 'y' : -1;
d1072 2
a1073 2
 	ret = ab_compose_to_addr(cur_line, 1);
@@@@ -4965,7 +4965,7 @@@@
d1082 1
a1082 1
@@@@ -4987,22 +4987,22 @@@@
d1114 1
a1114 1
@@@@ -5030,8 +5030,8 @@@@
d1125 1
a1125 1
@@@@ -5053,7 +5053,7 @@@@
d1134 1
a1134 1
@@@@ -5062,8 +5062,8 @@@@
d1145 1
a1145 1
@@@@ -5080,7 +5080,7 @@@@
d1154 1
a1154 1
@@@@ -5092,7 +5092,7 @@@@
d1163 1
a1163 1
@@@@ -5131,17 +5131,17 @@@@
d1185 1
a1185 1
@@@@ -5157,7 +5157,7 @@@@
d1194 1
a1194 1
@@@@ -5194,14 +5194,14 @@@@
d1211 1
a1211 1
@@@@ -5227,7 +5227,7 @@@@
d1220 1
a1220 1
@@@@ -5246,63 +5246,63 @@@@
d1298 1
a1298 1
@@@@ -5312,17 +5312,17 @@@@
d1319 1
a1319 1
@@@@ -5381,11 +5381,11 @@@@
d1334 1
a1334 1
@@@@ -5403,7 +5403,7 @@@@
d1343 1
a1343 1
@@@@ -5523,7 +5523,7 @@@@
d1352 1
a1352 1
@@@@ -5606,7 +5606,7 @@@@
d1361 1
a1361 1
@@@@ -5725,18 +5725,18 @@@@
d1384 1
a1384 1
@@@@ -6378,7 +6378,7 @@@@
d1393 1
a1393 1
@@@@ -6390,12 +6390,12 @@@@
d1408 1
a1408 1
@@@@ -6412,11 +6412,11 @@@@
d1422 1
a1422 1
@@@@ -6425,11 +6425,11 @@@@
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 4
a4 4
--- pine/addrbook.c.orig	Thu Jul  9 05:35:32 1998
+++ pine/addrbook.c	Tue Aug  4 12:42:15 1998
@@@@ -126,13 +126,13 @@@@
 int	       addr_scroll_callback PROTO((int, long));
d14 1
d22 1
d26 1
a26 1
@@@@ -283,7 +283,7 @@@@
d35 1
a35 1
@@@@ -353,7 +353,7 @@@@
d40 1
a40 1
+	"ѩba}ï榡䤣쨬HѪr, ]ϥιw]Ҧ");
d44 1
a44 1
@@@@ -575,7 +575,7 @@@@
d53 1
a53 1
@@@@ -1676,14 +1676,14 @@@@
d69 2
a70 2
     ab_nesting_level = 0;
@@@@ -1701,14 +1701,14 @@@@
d86 20
a105 2
     ab_nesting_level = 0;
@@@@ -1737,7 +1737,7 @@@@
d114 1
a114 1
@@@@ -1746,7 +1746,7 @@@@
d119 1
a119 1
+    p = addr_book(SelectNicksCom, "s边Gܦa}", error);
d123 1
a123 1
@@@@ -1781,7 +1781,7 @@@@
d132 1
a132 1
@@@@ -1794,7 +1794,7 @@@@
d141 1
a141 1
@@@@ -1829,7 +1829,7 @@@@
d150 1
a150 1
@@@@ -1838,7 +1838,7 @@@@
d159 1
a159 1
@@@@ -1871,7 +1871,7 @@@@
d168 10
a177 1
@@@@ -1912,7 +1912,7 @@@@
d186 10
a195 1
@@@@ -1957,7 +1957,7 @@@@
d204 10
a213 1
@@@@ -2005,7 +2005,7 @@@@
d222 10
a231 1
@@@@ -2037,8 +2037,8 @@@@
d238 1
a238 1
+	{"N", "U@@Ӷ", {MC_NEXTITEM,1,{'n'}}, KS_NONE},
d242 1
a242 1
@@@@ -2061,10 +2061,10 @@@@
d257 1
a257 1
@@@@ -2193,7 +2193,7 @@@@
d266 1
a266 1
@@@@ -2201,7 +2201,7 @@@@
d275 1
a275 1
@@@@ -2211,7 +2211,7 @@@@
d284 1
a284 2
@@@@ -2342,8 +2342,8 @@@@
 	    char buf[80], *bp;
d287 12
a298 8
-		sprintf(buf, "ADDRESS BOOK%s%s%s",
-			(!as.opened) ? " LIST" : 
+		sprintf(buf, "a}ï%s%s%s",
+			(!as.opened) ? "C" : 
 			  (as.n_addrbk > 1) ? " <" : "",
 		        (as.opened && as.n_addrbk > 1 && pab->nickname)
 							? pab->nickname : "",
@@@@ -2418,7 +2418,7 @@@@
d307 1
a307 1
@@@@ -2431,22 +2431,22 @@@@
d337 1
a337 1
@@@@ -2459,7 +2459,7 @@@@
d346 32
a377 10
@@@@ -2474,7 +2474,7 @@@@
 		      cmd = MC_POPUP;
 
 		    menu_init_binding(km, '<', cmd, "<",
-				     cmd == MC_POPUP ? "AddbkList" : "Unexpand",
+				     cmd == MC_POPUP ? "a}ïC" : "_i}",
 				      TWO_KEY);
 		    menu_add_binding(km, ',', cmd);
 		    if(F_ON(F_ARROW_NAV,ps))
@@@@ -2489,7 +2489,7 @@@@
d380 1
a380 1
 		if(entry_is_askserver(as.top_ent+as.cur_row)){
d386 1
a386 1
@@@@ -2497,7 +2497,7 @@@@
d395 1
a395 1
@@@@ -2505,7 +2505,7 @@@@
d398 1
a398 1
 		else if(as.opened){
d404 1
a404 1
@@@@ -2518,7 +2518,7 @@@@
d413 1
a413 1
@@@@ -2528,12 +2528,12 @@@@
d416 1
a416 1
 		if(as.opened && as.checkboxes){
d422 1
a422 1
 		else if(as.opened && listmode_ok){
d428 1
a428 1
@@@@ -2550,7 +2550,7 @@@@
d437 1
a437 1
@@@@ -2569,18 +2569,18 @@@@
d444 1
d447 31
d480 4
a483 3
-			    menu_init_binding(km, '<', cmd, "<", "AddbkList",
+			    menu_init_binding(km, '<', cmd, "<", "a}ïC",
 					      TWO_KEY);
d492 1
a492 1
@@@@ -2592,9 +2592,9 @@@@
d504 1
a504 1
@@@@ -2604,14 +2604,14 @@@@
d521 1
a521 1
@@@@ -2621,7 +2621,7 @@@@
d530 1
a530 1
@@@@ -2661,10 +2661,10 @@@@
d536 2
a537 2
-				      as.opened ? "[View/Update]"
-						: "[ViewAbook]",
d540 2
a541 2
+				      as.opened ? "[˵/s]"
+						: "[˵a}ï]",
d545 1
a545 1
@@@@ -2777,34 +2777,34 @@@@
d548 11
a558 49
 	    if(as.config){
-		helper(h_abook_config, "HELP ON CONFIGURING ADDRESS BOOKS",
+		helper(h_abook_config, "]wa}ïU",
 		       HLPD_NONE);
 	    }
 	    else if(are_selecting){
 		if(as.opened){
 		    /* single nick select from TakeAddr */
 		    if(style == SelectNickTake)
-		      helper(h_abook_select_nicks_take, "HELP ON ADDRESS BOOK",
+		      helper(h_abook_select_nicks_take, "a}ïU",
 			     HLPD_SIMPLE | HLPD_NEWWIN);
 		    /* single nick select from addrbook */
 		    else if(selecting_one_nick)
-		      helper(h_abook_select_nick, "HELP ON ADDRESS BOOK",
+		      helper(h_abook_select_nick, "a}ïU",
 			     HLPD_SIMPLE | HLPD_NEWWIN);
 		    /* can use X checkbox command now */
 		    else if(as.checkboxes)
-		      helper(h_abook_select_checks, "HELP ON ADDRESS BOOK",
+		      helper(h_abook_select_checks, "a}ïU",
 			     HLPD_SIMPLE | HLPD_NEWWIN);
 		    /* ListMode command available */
 		    else if(listmode_ok)
-		      helper(h_abook_select_listmode, "HELP ON ADDRESS BOOK",
+		      helper(h_abook_select_listmode, "a}ïU",
 			     HLPD_SIMPLE | HLPD_NEWWIN);
 		    /* no ListMode command available */
 		    else
-		      helper(h_abook_select_addr, "HELP ON ADDRESS BOOK",
+		      helper(h_abook_select_addr, "a}ïU",
 			     HLPD_SIMPLE | HLPD_NEWWIN);
 		}
 		else{
-		    helper(h_abook_select_top, "HELP ON ADDRESS BOOK",
+		    helper(h_abook_select_top, "a}ïU",
 			   HLPD_SIMPLE | HLPD_NEWWIN);
 		}
 	    }
@@@@ -2812,9 +2812,9 @@@@
 	    else{
 		ps->next_screen = SCREEN_FUN_NULL;
 		if(as.opened)
-		  helper(h_abook_opened, "HELP ON ADDRESS BOOK", HLPD_NONE);
+		  helper(h_abook_opened, "a}ïU", HLPD_NONE);
 		else
-		  helper(h_abook_top, "HELP ON ADDRESS BOOK", HLPD_NONE);
+		  helper(h_abook_top, "a}ïU", HLPD_NONE);
 	    }
d561 2
a562 1
@@@@ -2887,7 +2887,7 @@@@
d571 1
a571 1
@@@@ -2923,7 +2923,7 @@@@
d580 1
a580 1
@@@@ -2984,11 +2984,11 @@@@
d594 1
a594 1
@@@@ -3034,7 +3034,7 @@@@
d603 1
a603 1
@@@@ -3046,7 +3046,7 @@@@
d612 1
a612 1
@@@@ -3068,7 +3068,7 @@@@
d621 1
a621 1
@@@@ -3152,7 +3152,7 @@@@
d630 1
a630 1
@@@@ -3214,16 +3214,16 @@@@
d650 1
a650 1
@@@@ -3247,7 +3247,7 @@@@
d659 1
a659 1
@@@@ -3262,7 +3262,7 @@@@
d668 1
a668 1
@@@@ -3406,7 +3406,7 @@@@
d677 1
a677 1
@@@@ -3442,7 +3442,7 @@@@
d686 1
a686 1
@@@@ -3450,7 +3450,7 @@@@
d695 1
a695 1
@@@@ -3505,7 +3505,7 @@@@
d704 1
a704 1
@@@@ -3523,7 +3523,7 @@@@
d713 1
a713 1
@@@@ -3596,8 +3596,8 @@@@
d724 1
a724 8
@@@@ -3615,7 +3615,7 @@@@
 	  case MC_PREVITEM:
 	    r = prev_selectable_line(as.cur_row+as.top_ent, &new_line);
 	    if(r == 0){
-		q_status_message(SM_INFO, 0, 1, "Already on first line.");
+		q_status_message(SM_INFO, 0, 1, "wgbĤ@@FC");
 		break;
 	    }
d726 8
a733 8
@@@@ -3654,7 +3654,7 @@@@
 	  case MC_NEXTITEM:
 	    r = next_selectable_line(as.cur_row+as.top_ent, &new_line);
 	    if(r == 0){
-		q_status_message(SM_INFO, 0, 1, "Already on last line.");
+		q_status_message(SM_INFO, 0, 1, "wgb̫@@FC");
 		break;
 	    }
d735 8
a742 1
@@@@ -3733,7 +3733,7 @@@@
d751 1
a751 1
@@@@ -3786,7 +3786,7 @@@@
d760 10
a769 10
@@@@ -3809,7 +3809,7 @@@@
 		else{
 		    new_top_ent = as.top_ent;
 		    if(as.cur_row == (fl - as.top_ent)){ /* no change */
-			q_status_message(SM_INFO,0,1,"Already on last page.");
+			q_status_message(SM_INFO,0,1,"wgb̫@@FC");
 			break;
 		    }
 		}
@@@@ -3848,14 +3848,14 @@@@
d786 1
a786 1
@@@@ -3917,7 +3917,7 @@@@
d791 1
a791 1
+                q_status_message(SM_ORDER, 0, 4, "Siѿܪ");
d795 1
a795 1
@@@@ -3936,10 +3936,10 @@@@
d808 1
a808 1
@@@@ -3956,11 +3956,11 @@@@
d822 1
a822 10
@@@@ -3968,7 +3968,7 @@@@
 	    /*------ Turn all checkboxes on ---------*/
 	  case MC_SELALL:
 	    if(!any_addrs_avail(as.top_ent+as.cur_row)){
-                q_status_message(SM_ORDER, 0, 4, "No entries to select");
+                q_status_message(SM_ORDER, 0, 4, "Siѿܪ");
                 break;
 	    }
 
@@@@ -4018,7 +4018,7 @@@@
d831 1
a831 1
@@@@ -4038,13 +4038,13 @@@@
d848 1
a848 1
@@@@ -4099,7 +4099,7 @@@@
d857 9
a865 1
@@@@ -4134,7 +4134,7 @@@@
d874 1
a874 1
@@@@ -4195,7 +4195,7 @@@@
d883 1
a883 1
@@@@ -4262,11 +4262,11 @@@@
d897 1
a897 1
@@@@ -4279,7 +4279,7 @@@@
d906 1
a906 1
@@@@ -4321,7 +4321,7 @@@@
d915 1
a915 1
@@@@ -4377,7 +4377,7 @@@@
d924 1
a924 1
@@@@ -4399,7 +4399,7 @@@@
d933 1
a933 1
@@@@ -4414,14 +4414,14 @@@@
d950 1
a950 1
@@@@ -4453,18 +4453,18 @@@@
d972 1
a972 1
@@@@ -4499,7 +4499,7 @@@@
d978 1
a978 1
 	if(as.opened){
d981 1
a981 1
@@@@ -4540,7 +4540,7 @@@@
d986 1
a986 1
+	q_status_message(SM_ORDER, 0, 2, "SwܪإiY");
d990 1
a990 1
@@@@ -4601,7 +4601,7 @@@@
d999 1
a999 1
@@@@ -4622,11 +4622,11 @@@@
d1014 1
a1014 1
@@@@ -4643,9 +4643,9 @@@@
d1019 2
a1020 2
-	dl->type == Title ? "Address Book"
-			  : "Distribution List");
d1022 2
a1023 2
+	dl->type == Title ? "a}ï"
+			  : "C");
d1027 1
a1027 1
@@@@ -4661,7 +4661,7 @@@@
d1036 1
a1036 1
@@@@ -4671,7 +4671,7 @@@@
d1045 1
a1045 1
@@@@ -4690,11 +4690,11 @@@@
d1062 10
a1071 1
@@@@ -4726,7 +4726,7 @@@@
d1080 1
a1080 1
@@@@ -4748,22 +4748,22 @@@@
d1095 1
a1095 2
-    static char *sel_pmt1 = "ALTER message selection : ";
+    static char *sel_pmt1 = "TܡG";
d1112 1
a1112 1
@@@@ -4791,8 +4791,8 @@@@
d1123 1
a1123 1
@@@@ -4814,7 +4814,7 @@@@
d1132 1
a1132 1
@@@@ -4823,8 +4823,8 @@@@
d1143 1
a1143 1
@@@@ -4841,7 +4841,7 @@@@
d1152 1
a1152 1
@@@@ -4853,7 +4853,7 @@@@
d1161 1
a1161 1
@@@@ -4892,7 +4892,7 @@@@
d1170 14
a1183 1
@@@@ -4918,7 +4918,7 @@@@
d1192 1
a1192 1
@@@@ -4955,14 +4955,14 @@@@
d1209 1
a1209 1
@@@@ -4988,7 +4988,7 @@@@
d1218 1
a1218 1
@@@@ -5007,63 +5007,63 @@@@
d1243 1
a1243 1
+				       "ܥ! S󶵥سQ");
d1296 1
a1296 1
@@@@ -5073,13 +5073,13 @@@@
d1306 9
a1314 3
 	q_status_message(SM_ORDER | SM_DING, 3, 3,
-			 "Select is not supported from the top-level view");
+			 "|䴩۳h");
d1317 1
a1317 2
 
@@@@ -5137,11 +5137,11 @@@@
d1332 1
a1332 1
@@@@ -5159,7 +5159,7 @@@@
d1341 1
a1341 1
@@@@ -5279,7 +5279,7 @@@@
d1350 1
a1350 1
@@@@ -5362,7 +5362,7 @@@@
d1359 1
a1359 1
@@@@ -5481,18 +5481,18 @@@@
d1382 1
a1382 1
@@@@ -6115,7 +6115,7 @@@@
d1387 1
a1387 1
+    sprintf(prompt, "jMr [%s]G", search_string);
d1391 1
a1391 1
@@@@ -6127,12 +6127,12 @@@@
d1406 1
a1406 1
@@@@ -6149,11 +6149,11 @@@@
d1420 1
a1420 1
@@@@ -6162,11 +6162,11 @@@@
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 20
a20 19
--- pine/folder.c.orig	Wed Jul 22 06:01:07 1998
+++ pine/folder.c	Tue Jul 28 08:35:02 1998
@@@@ -62,13 +62,13 @@@@
 			  ((X)->dir->status&CNTXT_PARTFIND) == 0)
 #define	FLDR_NAME(X)	((X) ? ((X)->nickname ? (X)->nickname : (X)->name) :"")
 #define	SUBSCRIBE_PMT	\
-		       "Enter newsgroup name (or partial name to get a list): "
-#define	LISTMODE_GRIPE	"Use \"X\" to mark selections in list mode"
-#define	SEL_ALTER_PMT	"ALTER folder selection : "
-#define	SEL_TEXT_PMT	"Select by folder Name or Contents ? "
-#define	SEL_PROP_PMT	"Select by which folder property ? "
+		       "JsDոsW(γW٥HoC)G"
+#define	LISTMODE_GRIPE	"H \"X\" ӦbCҦХܿ"
+#define	SEL_ALTER_PMT	"ƧXܡG"
+#define	SEL_TEXT_PMT	"ھڸƧXW٩ΤeܡH"
+#define	SEL_PROP_PMT	"ھڭ@@ӸƧXʽH"
 #define DIR_FOLD_PMT \
-		"Folder by the same name *MAY* get deleted as well.  Continue"
+		"PW٪ƧX *i* QRC~"
a21 1
 #define	mail_list(S, R, N)	mail_list_internal(S, R, N)
a22 1
@@@@ -269,18 +269,18 @@@@
d24 1
a24 14
  * Various screen keymenu/command binding s.
  */
-#define PREVC_MENU {"P", "PrevCltn",   {MC_PREVITEM, 1, {'p'}}, KS_NONE}
-#define NEXTC_MENU {"N", "NextCltn",   {MC_NEXTITEM, 2, {'n',TAB}}, KS_NONE}
-#define	DELC_MENU  {"D", "Del Cltn",   {MC_DELETE,2,{'d',KEY_DEL}}, KS_NONE}
-#define PREVF_MENU {"P", "PrevFldr",   {MC_PREVITEM, 1, {'p'}}, KS_NONE}
-#define NEXTF_MENU {"N", "NextFldr",   {MC_NEXTITEM, 2, {'n',TAB}}, KS_NONE}
-#define	CIND_MENU  {"I", "CurIndex",   {MC_INDEX,1,{'i'}}, KS_FLDRINDEX}
+#define PREVC_MENU {"P", "e@@`",   {MC_PREVITEM, 1, {'p'}}, KS_NONE}
+#define NEXTC_MENU {"N", "@@`",   {MC_NEXTITEM, 2, {'n',TAB}}, KS_NONE}
+#define	DELC_MENU  {"D", "R`",   {MC_DELETE,2,{'d',KEY_DEL}}, KS_NONE}
+#define PREVF_MENU {"P", "e@@ƧX",   {MC_PREVITEM, 1, {'p'}}, KS_NONE}
+#define NEXTF_MENU {"N", "@@ƧX",   {MC_NEXTITEM, 2, {'n',TAB}}, KS_NONE}
+#define	CIND_MENU  {"I", "",   {MC_INDEX,1,{'i'}}, KS_FLDRINDEX}
d26 151
a176 36
 static struct key context_mgr_keys[] = 
        {HELP_MENU,
 	OTHER_MENU,
-        {"<", "Main Menu", {MC_MAIN,3,{'m','<',','}}, KS_EXITMODE},
-        {">", "[View Cltn]",
+        {"<", "D", {MC_MAIN,3,{'m','<',','}}, KS_EXITMODE},
+        {">", "[˵`]",
 	 {MC_CHOICE,5,{'v','>','.',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREVC_MENU,
 	NEXTC_MENU,
@@@@ -312,15 +312,15 @@@@
 static struct key context_cfg_keys[] = 
        {HELP_MENU,
 	OTHER_MENU,
-	{"E", "Exit Setup", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
-	{"C", "[Change]", {MC_EDIT,3,{'c',ctrl('M'),ctrl('J')}}, KS_NONE},
+	{"E", "}]w", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+	{"C", "[ק]", {MC_EDIT,3,{'c',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREVC_MENU,
 	NEXTC_MENU,
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
-	{"A", "Add Cltn", {MC_ADD,1,{'a'}}, KS_NONE},
+	{"A", "sW`", {MC_ADD,1,{'a'}}, KS_NONE},
 	DELC_MENU,
-	{"$", "Shuffle", {MC_SHUFFLE,1,{'$'}},KS_NONE},
+	{"$", "", {MC_SHUFFLE,1,{'$'}},KS_NONE},
 	WHEREIS_MENU,
 
 	HELP_MENU,
@@@@ -339,9 +339,9 @@@@
 
 static struct key context_select_keys[] = 
        {HELP_MENU,
-	{"E", "ExitSelect", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+	{"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
a177 11
-	{">", "[View Cltn]",
+	{">", "[˵`]",
 	 {MC_CHOICE, 5, {'v','>','.',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREVC_MENU,
 	NEXTC_MENU,
@@@@ -355,9 +355,9 @@@@
 
 static struct key context_fcc_keys[] = 
        {HELP_MENU,
-	{"E", "ExitSelect", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+	{"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
d179 4
a182 16
-	{">", "[View Cltn]",
+	{">", "[˵`]",
 	 {MC_CHOICE, 5, {'v','>','.',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREVC_MENU,
 	NEXTC_MENU,
@@@@ -372,16 +372,16 @@@@
 static struct key folder_keys[] =
        {HELP_MENU,
   	OTHER_MENU,
-	{"<", NULL, {MC_EXIT,3,{' ','<',','}}, KS_NONE},
-        {">", "[View Fldr]",
+	{"M", NULL, {MC_EXIT,3,{' ','<',','}}, KS_NONE},
+        {">", "[˵ɮקX]",
 	 {MC_CHOICE,5,{'v','>','.',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREVF_MENU,
 	NEXTF_MENU,
d185 2
a186 35
-	{"A","Add",{MC_ADDFLDR,1,{'a'}},KS_NONE},
+	{"A","sW",{MC_ADDFLDR,1,{'a'}},KS_NONE},
 	DELETE_MENU,
-	{"R","Rename",{MC_RENAMEFLDR,1,{'r'}}, KS_NONE},
+	{"R","W",{MC_RENAMEFLDR,1,{'r'}}, KS_NONE},
 	WHEREIS_MENU,
 
 	HELP_MENU,
@@@@ -393,9 +393,9 @@@@
 	CIND_MENU,
 	COMPOSE_MENU,
 	PRYNTTXT_MENU,
-	{"Z", "ZoomMode", {MC_ZOOM,1,{'z'}}, KS_NONE},
-	{";","Select",{MC_SELECT,1,{';'}},KS_SELECT},
-	{":","SelectCur",{MC_SELCUR,1,{':'}},KS_SELECT}};
+	{"Z", "YҦ", {MC_ZOOM,1,{'z'}}, KS_NONE},
+	{";","",{MC_SELECT,1,{';'}},KS_SELECT},
+	{":","ܥثe",{MC_SELCUR,1,{':'}},KS_SELECT}};
 INST_KEY_MENU(folder_km, folder_keys);
 #define	KM_COL_KEY	2
 #define	KM_SEL_KEY	3
@@@@ -407,9 +407,9 @@@@
 
 static struct key folder_sel_keys[] =
        {HELP_MENU,
- 	{"E", "ExitSelect", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
-	{"<", "Collections", {MC_COLLECTIONS,2,{'<',','}}, KS_NONE},
-        {"S", "[Select]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}},KS_NONE},
+ 	{"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+	{"<", "`", {MC_COLLECTIONS,2,{'<',','}}, KS_NONE},
+        {"S", "[]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}},KS_NONE},
 	PREVF_MENU,
 	NEXTF_MENU,
 	PREVPAGE_MENU,
@@@@ -423,9 +423,9 @@@@
d188 12
a199 4
 static struct key folder_sub_sel_keys[] =
        {HELP_MENU,
- 	{"E", "ExitSelect", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+ 	{"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
d201 138
a338 6
-        {"S", "[Select]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}},KS_NONE},
+        {"S", "[]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}},KS_NONE},
 	PREVF_MENU,
 	NEXTF_MENU,
 	PREVPAGE_MENU,
@@@@ -439,9 +439,9 @@@@
d340 89
a428 37
 static struct key folder_fcc_keys[] =
        {HELP_MENU,
-	{"E", "ExitSelect", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
-	{"<", "Collections", {MC_COLLECTIONS,2,{'<',','}}, KS_NONE},
-	{"S", "[Select]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}},
+	{"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+	{"<", "`", {MC_COLLECTIONS,2,{'<',','}}, KS_NONE},
+	{"S", "[]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}},
 	 KS_NONE},
 	PREVF_MENU,
 	NEXTF_MENU,
@@@@ -457,9 +457,9 @@@@
 
 static struct key folder_sub_keys[] =
        {HELP_MENU,
-	{"S", "Subscribe", {MC_CHOICE,1,{'s'}}, KS_NONE},
-  	{"E", "ExitSubscb", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
-        {NULL, "[Select]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}}, KS_NONE},
+	{"S", "q\\", {MC_CHOICE,1,{'s'}}, KS_NONE},
+  	{"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+        {NULL, "[]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREVF_MENU,
 	NEXTF_MENU,
 	PREVPAGE_MENU,
@@@@ -476,8 +476,8 @@@@
 static struct key folder_post_keys[] =
        {HELP_MENU,
  	NULL_MENU,
-	{"E", "ExitSelect", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
-	{"S", "[Select]", {MC_CHOICE, 3, {'s',ctrl('M'),ctrl('J')}}, KS_NONE},
+	{"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+	{"S", "[]", {MC_CHOICE, 3, {'s',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREVF_MENU,
 	NEXTF_MENU,
 	PREVPAGE_MENU,
@@@@ -572,12 +572,12 @@@@
     mailcap_free(); /* free resources we won't be using for a while */
d430 3
a432 11
     memset(&css, 0, sizeof(CONT_SCR_S));
-    css.title	     = "SETUP COLLECTION LIST";
+    css.title	     = "]w`C";
     css.print_string = "contexts ";
     css.start        = ps->context_current;
     css.contexts     = &ps_global->context_list;
     css.help.text    = h_collection_maint;
-    css.help.title   = "HELP FOR SETUP COLLECTION";
+    css.help.title   = "]w`U";
     css.keymenu	     = &c_cfg_km;
     css.edit	     = 1;
d434 49
a482 3
@@@@ -866,7 +866,7 @@@@
 	/* leave (*new_dir)->ref == NULL */
     }
d484 7
a490 4
-    sprintf(tmp_20k_buf, "List of folders matching \"%s*\"", folder);
+    sprintf(tmp_20k_buf, "ŦX \"%s*\" ƧXC", folder);
     (*new_dir)->desc = cpystr(tmp_20k_buf);
 }
d492 1
a492 2
@@@@ -965,12 +965,12 @@@@
 	CONT_SCR_S css;
d494 6
a499 24
 	memset(&css, 0, sizeof(CONT_SCR_S));
-	css.title	 = "COLLECTION LIST";
+	css.title	 = "`C";
 	css.print_string = "contexts ";
 	css.start        = start;
 	css.contexts	 = &ps_global->context_list;
 	css.help.text	 = h_collection_screen;
-	css.help.title   = "HELP FOR COLLECTION LIST";
+	css.help.title   = "`CU";
 	css.keymenu	 = km;
 	css.edit	 = edit_config;
 
@@@@ -1041,7 +1041,7 @@@@
     pbuf.browse_help   = h_composer_browse;
     pbuf.attach_help   = h_composer_ctrl_j;
     pbuf.composer_help = h_composer;
-    sprintf(tmp, "FOLDER COLLECTION %s", func);
+    sprintf(tmp, "ƧX` %s", func);
     pbuf.pine_anchor   = set_titlebar(tmp, ps_global->mail_stream,
 				      ps_global->context_current,
 				      ps_global->cur_folder,ps_global->msgmap, 
@@@@ -1277,10 +1277,10 @@@@
 	else
 	  exists = (i & FEX_ISDIR);
d501 1
a501 45
-	sprintf(prompt, "Exit%s" ,
+	sprintf(prompt, "}%s" ,
 		exists
-		  ? " and save changes"
-		  : ", saving changes and creating Path");
+		  ? " æs"
+		  : "Asɨëإ߸|");
 	if(want_to(prompt, 'y', 0, NO_HELP, WT_NORM) == 'y'){
 	    if(!exists && !mail_create(NULL, tmp)){
 		flush_status_messages(1);	/* mail_create gripes */
@@@@ -1312,7 +1312,7 @@@@
     char *rstr = NULL;
     void (*redraw)() = ps_global->redrawer;
 #define	CCA_PROMPT	\
-		"Cancel Add (answering \"Yes\" will abandon any changes made) "
+		"sW (^ \"Yes\" NeL) "
 
     ps_global->redrawer = redraw_pico;
     fix_windsize(ps_global);
@@@@ -1429,7 +1429,7 @@@@
 /*BUG: test writing with NNTP to misc.test via mark's code. reasonable err msg?*/
     if(NEWS_TEST(fs->context)) {
 	q_status_message(SM_ORDER | SM_DING, 3, 4,
-		 "Can't save messages to bulletin boards or news groups!");
+		 "LkNTsܹqlGiηsDոsWI");
 	return(0);
     }
 #endif
@@@@ -1444,7 +1444,7 @@@@
     FSTATE_S *fs;
 {
     if(!strncmp(f->prefix, "SUB", 3)){
-	q_status_message1(SM_ORDER, 0, 4, "Already subscribed to \"%s\"",
+	q_status_message1(SM_ORDER, 0, 4, "wq\\ \"%s\"",
 			  FLDR_NAME(f));
 	return(0);
     }
@@@@ -1457,7 +1457,7 @@@@
 fl_hdr_gen(ps)
     struct pine *ps;
 {
-    set_titlebar("FOLDER LIST", ps->mail_stream, ps->context_current,
+    set_titlebar("HXC", ps->mail_stream, ps->context_current,
 		 ps->cur_folder, ps->msgmap, 1, FolderName, 0, 0);
 }
d503 1
a503 26
@@@@ -1572,7 +1572,7 @@@@
 {
     int		     ch, cmd, mangled_footer, mangled_header,
 		     n, rc, cur_row, cur_col, km_size, was_dir = -1,
-		     km_popped = 0, listmode = 0, done = 0;
+		     km_popped = 0, listmode = 0, done = 0, exit_to_main = 0;
     unsigned short   new_col;
     FOLDER_S        *cur_f = NULL;
     STRINGLIST	    *sl = NULL;
@@@@ -1682,7 +1682,7 @@@@
 		    km.keys[KM_MAIN_KEY].bind.cmd = MC_NONE;
 		    km.keys[KM_MAIN_KEY].bind.nch = 0;
 
-		    km.keys[KM_COL_KEY].label = "Main Menu";
+		    km.keys[KM_COL_KEY].label = "D";
 		    km.keys[KM_COL_KEY].bind.cmd = MC_MAIN;
 		    km.keys[KM_COL_KEY].bind.ch[0] = 'm';
 		}
@@@@ -1702,14 +1702,14 @@@@
 		if(listmode){
 		    clrbitn(SB_LIST_KEY, bitmap);
 		    km.keys[SB_SEL_KEY].name = "X";
-		    km.keys[SB_SEL_KEY].label = "[Set/Unset]";
+		    km.keys[SB_SEL_KEY].label = "[]w/]w]";
 		    km.keys[SB_SEL_KEY].bind.cmd = MC_SELCUR;
 		    km.keys[SB_SEL_KEY].bind.ch[0] = 'x';
d505 9
a513 30
 		else{
 		    clrbitn(SB_SUB_KEY, bitmap);
 		    km.keys[SB_SEL_KEY].name = "S";
-		    km.keys[SB_SEL_KEY].label = "[Subscribe]";
+		    km.keys[SB_SEL_KEY].label = "[q\\]";
 		    km.keys[SB_SEL_KEY].bind.cmd = MC_CHOICE;
 		    km.keys[SB_SEL_KEY].bind.ch[0] = 's';
 		}
@@@@ -1723,7 +1723,7 @@@@
 	    }
 
 	    if(cur_f && cur_f->isdir){
-		static struct key sel_key = {">", "[View Dir]",
+		static struct key sel_key = {">", "[˵ؿ]",
 					     {MC_CHOICE,5,
 					      {'s','>','.',
 					       ctrl('M'),ctrl('J')}},
@@@@ -1849,8 +1849,15 @@@@
             /*---------------------- Key left --------------*/
 	  case MC_CHARLEFT :
 	  case MC_PREVITEM :
+	    if (exit_to_main)
+	    {
+		ps_global->next_screen = main_menu_screen;
+		done++;	    
+	    }
 	    if((n = folder_lister_prev(fs)) >= 0)
 	      fs->folder_index = n;
+	    else
+	      exit_to_main = 1;
d516 2
a517 25
  
@@@@ -1858,6 +1865,7 @@@@
             /*--------------------- Key right -------------------*/
 	  case MC_CHARRIGHT :
 	  case MC_NEXTITEM :
+	    exit_to_main = 0;
 	    if(n = folder_lister_next(fs))
 	      fs->folder_index = n;
 
@@@@ -1879,7 +1887,7 @@@@
 	      rc--;
 
 	    if(rc < 0){
-		q_status_message(SM_ORDER, 0, 1, "Already on first line.");
+		q_status_message(SM_ORDER, 0, 1, "wgĤ@@FC");
 		if(fs->top_row != 0){		/* make sure! */
 		    fs->top_row    = 0;
 		    fs->prev_index = -1;
@@@@ -1925,7 +1933,7 @@@@
 				   FOLDERS(fs->context))->d_line + 1;
 
 	    if(rc > fs->last_row){
-		q_status_message(SM_ORDER, 0, 1, "Already on last line.");
+		q_status_message(SM_ORDER, 0, 1, "wg̫@@FC");
 		break;
d519 43
d563 2
a564 2
@@@@ -2044,7 +2052,7 @@@@
 		  rc++;
d567 3
a569 2
-	      q_status_message(SM_ORDER,0,1,"Already on first page.");
+	      q_status_message(SM_ORDER,0,1,"wgĤ@@FC");
d571 1
a571 1
             break;
d573 7
a579 6
@@@@ -2057,7 +2065,7 @@@@
 	    if((rc = fs->top_row + fs->display_rows) > fs->last_row){
 		if((int)folder_entry(fs->folder_index,
 				FOLDERS(fs->context))->d_line >= fs->last_row){
-		    q_status_message(SM_ORDER,0,1,"Already on last page.");
+		    q_status_message(SM_ORDER,0,1,"wg̫@@FC");
d582 20
a601 2
 		else
@@@@ -2098,7 +2106,7 @@@@
d604 2
a605 3
 	      q_status_message(SM_ORDER | SM_DING, 3, 3, 
-			       "Sorry, no help text available");
+			       "ܩpArLko");
d609 25
a633 11
@@@@ -2107,7 +2115,7 @@@@
 	  case MC_CHOICE :
 	    if(!folder_total(FOLDERS(fs->context))){
 		q_status_message(SM_ORDER | SM_DING, 3, 3, 
-			      "Empty folder collection.  Nothing to select!");
+			      "ŪƧX`CSFiѿܡI");
 	    }
 	    else if(folder_lister_select(cur_f, fs, listmode)){
 		mangled_footer++;
@@@@ -2169,7 +2177,7 @@@@
 		mangled_footer++;
a634 3
 	    else
-	      q_status_message(SM_ORDER, 0, 4, "Already in List Mode");
+	      q_status_message(SM_ORDER, 0, 4, "wgbCҦFC");
d636 19
a654 1
 	    break;
d656 6
a661 8
@@@@ -2302,8 +2310,8 @@@@
 	  case MC_DELETE :
 	    if(!ALL_FOUND(fs->context) || (fs->context->use & CNTXT_PSEUDO)){
 		q_status_message1(SM_ORDER | SM_DING, 0, 3,
-				  "No folder selected to delete.  %s list.",
-				  ALL_FOUND(fs->context) ? "Empty" : "Expand");
+				  "|ܨѧRƧXC%sCC",
+				  ALL_FOUND(fs->context) ? "" : "i}");
d665 11
a675 7
@@@@ -2381,13 +2389,13 @@@@
 		if(fs->zoomed = !fs->zoomed){	/* clear all the prefixes */
 		    (void) folder_lister_nearest_selected(fs);
 		    q_status_message1(SM_ORDER, 0, 3,
-	     "In Zoomed list of %s folders. Use \"Z\" to restore regular list",
+	     "b %s ӸƧXY񪺦CCϥ \"Z\" Ӧ^_`C",
 				      int2string(n));
d677 4
d682 2
d685 6
a690 3
 		    q_status_message(SM_ORDER, 0, 3,
-				     "Folder List Zoom mode is now off");
+				     "ƧXCYҦثeA");
d692 10
d703 4
a706 2
 		create_folder_display(fs, ps->ttyo->screen_cols);
@@@@ -2395,7 +2403,7 @@@@
a707 4
 	    else
 	      q_status_message(SM_ORDER, 0, 3,
-			       "No selected folders to Zoom on");
+			       "|ܨѩjƧXC");
d709 8
d718 1
a718 8
 	    break;
@@@@ -2405,16 +2413,16 @@@@
 	  case MC_WHEREIS :
 	    switch(search_folders(fs, -FOOTER_ROWS(ps))){
 	      case -1 :
-		cmd_cancelled("Folder name search");
+		cmd_cancelled("jMɮקXW");
 		break;
d720 17
a736 10
 	      case 0 :
-		q_status_message(SM_ORDER | SM_DING, 0, 2, "Word not found");
+		q_status_message(SM_ORDER | SM_DING, 0, 2, "䤣Ӧr");
 		break;
 
 	      case 2 :
 		q_status_message(SM_ORDER, 0, 2,
-				 "Search wrapped to beginning");
+				 "qYjM");
 		break;
d738 4
d743 1
a743 10
@@@@ -2475,8 +2483,8 @@@@
 	    && ALL_FOUND(fs->context))
       return(fs->folder_index + 1);
 
-    q_status_message1(SM_ORDER, 0, 1, "Already on last %sfolder",
-		      fs->zoomed ? "Zoomed " : "");
+    q_status_message1(SM_ORDER, 0, 1, "wgb̫@@%sƧXF",
+		      fs->zoomed ? "Y᪺" : "");
     return(0);
 }
d745 8
a752 10
@@@@ -2497,8 +2505,8 @@@@
     else if(fs->folder_index > 0 && ALL_FOUND(fs->context))
       return(fs->folder_index - 1);
 
-    q_status_message1(SM_ORDER, 0, 1, "Already on first %sfolder",
-		      fs->zoomed ? "Zoomed " : "");
+    q_status_message1(SM_ORDER, 0, 1, "wgbĤ@@%sƧXF",
+		      fs->zoomed ? "Y᪺" : "");
     return(-1);
 }
d754 7
a760 26
@@@@ -2513,7 +2521,7 @@@@
     if(listmode){
 	if(NEWS_TEST(fs->context) && !strncmp(f->prefix, "SUB", 3)){
 	    q_status_message1(SM_ORDER, 0, 3,
-			      "Already subscribed to \"%s\"",
+			      "wq\\ \"%s\"",
 			      FLDR_NAME(f));
 	}
 	else{
@@@@ -2523,7 +2531,7 @@@@
     }
     else{
 	if(f->isdir){
-	    q_status_message(SM_ORDER, 0, 3, "Can't select directories");
+	    q_status_message(SM_ORDER, 0, 3, "Lkܥؿ");
 	}
 	else
 	  folder_select_toggle(fs, f);
@@@@ -2580,13 +2588,13 @@@@
     extern     char *sel_pmt2;
 
     if((f = folder_entry(fs->folder_index, FOLDERS(fs->context)))->isdir){
-	q_status_message(SM_ORDER | SM_DING, 0, 3, "Can't Select directories");
+	q_status_message(SM_ORDER | SM_DING, 0, 3, "Lkܥؿ");
 	return(0);
     }
a761 8
     sel_opts = self_opts2;
     if(old_tot = selected_folders(fs)){
-	sel_opts1[1].label = "unselect Cur" + (f->selected ? 0 : 2);
+	sel_opts1[1].label = "ثe" + (f->selected ? 0 : 2);
 	sel_opts += 2;			/* disable extra options */
 	switch(q = radio_buttons(SEL_ALTER_PMT, -FOOTER_ROWS(ps_global),
 				 sel_opts1, 'c', 'x', help, RB_NORM)){
@@@@ -2611,7 +2619,7 @@@@
d763 16
a778 19
 	  default :
 	    q_status_message(SM_ORDER | SM_DING, 3, 3,
-			     "Unsupported Select option");
+			     "䴩ﶵ");
 	    return(0);
 	}
     }
@@@@ -2625,7 +2633,7 @@@@
      */
     switch(q){
       case 'x':				/* cancel */
-	cmd_cancelled("Select command");
+	cmd_cancelled("RO");
 	return(0);
 
       case 'c' :			/* toggle current's selected state */
@@@@ -2647,10 +2655,10 @@@@
 	      create_folder_display(fs, ps_global->ttyo->screen_cols);
 	}
d780 8
a787 8
-	q_status_message4(SM_ORDER, 0, 2, "%s%s folder%s %sselected",
-			  old_tot ? "" : "All ",
+	q_status_message3(SM_ORDER, 0, 2, "%s%s ӸƧXwQ%s",
+			  old_tot ? "" : " ",
 			  comatose(old_tot ? old_tot : n),
-			  plural(old_tot ? old_tot : n), old_tot ? "UN" : "");
+			  old_tot ? "" : "");
 	return(1);
d789 8
a796 2
       case 't' :			/* Text */
@@@@ -2667,7 +2675,7 @@@@
d798 20
a817 6
       default :
 	q_status_message(SM_ORDER | SM_DING, 3, 3,
-			 "Unsupported Select option");
+			 "䴩ﶵ");
 	return(0);
     }
d819 1
a819 1
@@@@ -2696,35 +2704,30 @@@@
d821 8
a828 68
     if(!(diff = (total = selected_folders(fs)) - old_tot)){
 	if(narrow)
-	  q_status_message4(SM_ORDER, 0, 2,
-			    "%s.  %s folder%s remain%s selected.",
-			    j ? "No change resulted"
-			      : "No messages in intersection",
-			    comatose(old_tot), plural(old_tot),
-			    (old_tot == 1L) ? "s" : "");
+	  q_status_message2(SM_ORDER, 0, 2,
+			    "%sC   %s ӸƧXQܡC",
+			    j ? "SɭP"
+			      : "ISH", comatose(old_tot));
 	else if(old_tot && j)
 	  q_status_message(SM_ORDER, 0, 2,
-		   "No change resulted.  Matching folders already selected.");
+		   "SɭPܡCŦXƧXwgQܤFC");
 	else
 	  q_status_message1(SM_ORDER | SM_DING, 0, 2,
-			    "Select failed!  No %sfolders selected.",
-			    old_tot ? "additional " : "");
+			    "ܥѡIS%sƧXQܡC",
+			    old_tot ? "B~ " : "");
     }
     else{
 	if(old_tot){
 	    sprintf(tmp_20k_buf,
-		    "Select matched %ld folder%s!  %s %sfolder%s %sselected.",
+		    "ܲŦX %ld ӸƧXI@@p %s ӸƧXQ%s.",
 		    (diff > 0) ? diff : old_tot + diff,
-		    plural((diff > 0) ? diff : old_tot + diff),
 		    comatose((diff > 0) ? total : -diff),
-		    (diff > 0) ? "total " : "",
-		    plural((diff > 0) ? total : -diff),
-		    (diff > 0) ? "" : "UN");
+		    (diff > 0) ? "" : "");
 	    q_status_message(SM_ORDER, 0, 2, tmp_20k_buf);
 	}
 	else{
-	    q_status_message2(SM_ORDER, 0, 2, "Select matched %s folder%s!",
-			      comatose(diff), plural(diff));
+	    q_status_message1(SM_ORDER, 0, 2, "ܲŦX %s ӸƧXI",
+			      comatose(diff));
 
 	    if(F_OFF(F_SELECTED_SHOWN_BOLD, ps_global)){
 		folder_prefixes(fs, "    ");
@@@@ -2839,7 +2842,7 @@@@
 	fp   = next_folder_dir(fs->context, tmpf->name);
 
 	/* Provide context in new collection header */
-	sprintf(tmp_20k_buf, "Dir: %s",
+	sprintf(tmp_20k_buf, "ؿG%s",
 		((p = strstr(fs->context->context, "%s")) && !*(p+2)
 		 && !strncmp(fp->ref, fs->context->context,
 			     p - fs->context->context))
@@@@ -2860,9 +2863,9 @@@@
 
 	fs->prev_index = -1;		  /* redraw display */
 
-	q_status_message2(SM_ORDER, 0, 3, "Now in %sdirectory: %s",
+	q_status_message2(SM_ORDER, 0, 3, "ثeb %sؿG%s",
 			  folder_total(FOLDERS(fs->context))
-			  ? "" : "EMPTY ",  fp->ref);
+			  ? "" : "Ū ",  fp->ref);
 	rv++;
     }
     else
@@@@ -2908,12 +2911,12 @@@@
 	fs->prev_index = -1;		  /* redraw display */
d830 6
a835 9
 	if(fp->status & CNTXT_SUBDIR)
-	  q_status_message1(SM_ORDER, 0, 3, "Now in directory: %s",
+	  q_status_message1(SM_ORDER, 0, 3, "ثeҦbؿG%s",
 			    strsquish(tmp_20k_buf + 500, fp->ref,
 				      fs->display_cols - 22));
 	else
 	  q_status_message(SM_ORDER, 0, 3,
-			   "Returned to collection's top directory");
+			   "^`̤Whؿ");
d837 1
a837 16
 	rv++;
     }
@@@@ -3479,12 +3482,12 @@@@
     if(fs->context->use & CNTXT_INCMNG){
 	char inbox_host[MAXPATH], *beg, *end = NULL;
 	ESCKEY_S *special_key;
-	static ESCKEY_S host_key[] = {{ctrl('X'),12,"^X","Use Inbox Host"},
+	static ESCKEY_S host_key[] = {{ctrl('X'),12,"^X","ϥ Inbox D"},
 				      {-1, 0, NULL, NULL}};
 
 	if(ps_global->readonly_pinerc){
 	    q_status_message(SM_ORDER,3,5,
-		"Addition cancelled: config file not editable");
+		"sWGLks]w");
 	    return(FALSE);
 	}
d839 8
a846 3
@@@@ -3506,7 +3509,7 @@@@
 	else
 	  special_key = NULL;
d848 8
a855 22
-	sprintf(tmp, "Name of server to contain added folder : ");
+	sprintf(tmp, "]tsWƧXDWG");
 	help = NO_HELP;
 	while(1){
 	    int flags = OE_APPEND_CURRENT;
@@@@ -3524,7 +3527,7 @@@@
 	    }
 	    else if(rc == 1){
 		q_status_message(SM_ORDER,0,2,
-		    "Addition of new folder cancelled");
+		    "sWƧX");
 		return(FALSE);
 	    }
 	    else if(rc == 0)
@@@@ -3534,7 +3537,7 @@@@
 
     if(offset = strlen(add_folder)){		/* must be host for incoming */
 	int i;
-	sprintf(tmp, "Folder on \"%s\" to add : ", add_folder);
+	sprintf(tmp, "[Jb \"%s\" WƧXG", add_folder);
 	for(i = offset;i >= 0; i--)
 	  add_folder[i+1] = add_folder[i];
d857 2
a858 6
@@@@ -3543,7 +3546,7 @@@@
 	add_folder[++offset] = '\0';		/* +2, total */
     }
     else
-      sprintf(tmp, "Folder name to add : ");
+      sprintf(tmp, "sWƧXW١G");
d860 5
a864 19
     help = NO_HELP;
     while(1){
@@@@ -3551,14 +3554,14 @@@@
 
 	p = NULL;
 	if(isdir){
-	    add_key[0].label = "Create Folder";
+	    add_key[0].label = "إ߸ƧX";
 	    if(tmp[0] == 'F')
-	      rplstr(tmp, 6, "Directory");
+	      rplstr(tmp, 6, "ؿ");
 	}
 	else{
-	    add_key[0].label = "Create Directory";
+	    add_key[0].label = "إߥؿ";
 	    if(tmp[0] == 'D')
-	      rplstr(tmp, 9, "Folder");
+	      rplstr(tmp, 9, "ƧX");
 	}
d866 6
a871 27
 	flags = OE_APPEND_CURRENT;
@@@@ -3572,7 +3575,7 @@@@
 	    if(!ps_global->show_dot_names && add_folder[offset] == '.'){
 		if(cnt++ <= 0)
                   q_status_message(SM_ORDER,3,3,
-		    "Folder name can't begin with dot");
+		    "ƧXHI \".\" Wٶ}Y");
 		else{
 		    NAMEVAL_S *feat;
 		    int i;
@@@@ -3582,7 +3585,7 @@@@
 		      ;/* do nothing */
 
 		    q_status_message1(SM_ORDER,3,3,
-		      "Config feature \"%s\" enables names beginning with dot",
+		      "]wɤ \"%s\" \\iϸƧXHI \".\" Wٶ}Y",
 		      feat && feat->name ? feat->name : "");
 		}
 
@@@@ -3602,7 +3605,7 @@@@
 	    }
 	    else if(*p == fs->context->dir->delim){
 		q_status_message(SM_ORDER|SM_DING, 3, 3,
-				 "Can't have trailing directory delimiters!");
+				 "঳ؿݪj \"/\"I");
 		display_message('X');
 		continue;
a872 10
@@@@ -3624,7 +3627,7 @@@@
 			: NO_HELP;
 	}
 	else if(rc == 1 || add_folder[0] == '\0') {
-	    q_status_message(SM_ORDER,0,2, "Addition of new folder cancelled");
+	    q_status_message(SM_ORDER,0,2, "sWƧX");
 	    return(FALSE);
 	}
     }
@@@@ -3643,7 +3646,7 @@@@
d874 20
a893 14
     help = NO_HELP;
     if(fs->context->use & CNTXT_INCMNG){
-	sprintf(tmp, "Nickname for folder \"%s\" : ", &add_folder[offset]);
+	sprintf(tmp, "ƧX\"%s\" ʺ١G", &add_folder[offset]);
 	while(1){
 	    int flags = OE_APPEND_CURRENT;
 
@@@@ -3664,7 +3667,7 @@@@
 	    }
 	    else if(rc == 1 || (rc != 3 && !*nickname)){
 		q_status_message(SM_ORDER,0,2,
-		    "Addition of new folder cancelled");
+		    "sWƧX");
 		return(FALSE);
d895 16
a910 17
 	}
@@@@ -3679,7 +3682,7 @@@@
 	    f = folder_entry(offset, FOLDERS(fs->context));
 	    if(!strucmp(FLDR_NAME(f), nickname[0] ? nickname : add_folder)){
 		q_status_message1(SM_ORDER | SM_DING, 0, 3,
-				  "Incoming folder \"%s\" already exists",
+				  "siƧX(Incoming folder) \"%s\" wsb",
 				  nickname[0] ? nickname : add_folder);
 		return(FALSE);
 	    }
@@@@ -3732,7 +3735,7 @@@@
 	if(nickname[0])
 	  strcpy(add_folder, nickname);		/* known by new name */
 
-	q_status_message1(SM_ORDER, 0, 3, "Folder \"%s\" created",add_folder);
+	q_status_message1(SM_ORDER, 0, 3, "ƧX \"%s\" wإ",add_folder);
 	return_val = add_folder;
d912 1
a912 10
     else if(context_isambig(add_folder)){
@@@@ -3748,15 +3751,15 @@@@
 	     */
 	    refresh_folder_list(fs, TRUE);
 
-	    q_status_message2(SM_ORDER, 0, 3, "%s \"%s\" created",
-			      isdir ? "Directory" : "Folder", add_folder);
+	    q_status_message2(SM_ORDER, 0, 3, "%s \"%s\" wإ",
+			      isdir ? "ؿ" : "ƧX", add_folder);
 	}
d914 18
a931 2
 	return_val = add_folder;
     }
d933 3
a935 20
       q_status_message1(SM_ORDER, 0, 3,
-			"Folder \"%s\" created outside current collection",
+			"ƧX \"%s\" إߩثe`~",
 			add_folder);
 
     return(return_val != NULL);
@@@@ -3795,13 +3798,13 @@@@
     subscribe_keys[i = 0].ch  = ctrl('T');
     subscribe_keys[i].rval    = 12;
     subscribe_keys[i].name    = "^T";
-    subscribe_keys[i++].label = "To All Grps";
+    subscribe_keys[i++].label = "Ҧոs";
 
     if(F_ON(F_ENABLE_TAB_COMPLETE,ps_global)){
 	subscribe_keys[i].ch	= ctrl('I');
 	subscribe_keys[i].rval  = 11;
 	subscribe_keys[i].name  = "TAB";
-	subscribe_keys[i++].label = "Complete";
+	subscribe_keys[i++].label = "";
     }
a936 9
     subscribe_keys[i].ch = -1;
@@@@ -3861,7 +3864,7 @@@@
 	    }
 	    else{
 		q_status_message(SM_ORDER, 0, 2,
-	       "No group substring to match! Use ^T to list all news groups.");
+	       "SŦXոsrIХ ^T CXҦsDոsC");
 		continue;
 	    }
d938 2
a939 59
@@@@ -3914,10 +3917,10 @@@@
 	    else{
 		if(rc == 12)
 		  q_status_message(SM_ORDER | SM_DING, 3, 3,
-				   "No groups to select from!");
+				   "SiѿܪոsI");
 		else
 		  q_status_message1(SM_ORDER, 3, 3,
-			  "News group \"%s\" didn't match any existing groups",
+			  "sDոs \"%s\" ŦX{sոs",
 			  folder);
 
 		continue;
@@@@ -3965,7 +3968,7 @@@@
 
     if(rc < 0){
 	if(rc == -1)
-	  q_status_message(SM_ORDER, 0, 3, "Subscribe cancelled");
+	  q_status_message(SM_ORDER, 0, 3, "q\\");
     }
     else{
 	if(folders){		/*------ Actually do the subscription -----*/
@@@@ -3987,7 +3990,7 @@@@
 		     */
 		    q_status_message1(errors ?SM_INFO : SM_ORDER,
 				      errors ? 0 : 3, 3,
-				      "Error subscribing to \"%s\"",
+				      "q\\ \"%s\" ɵoͿ~",
 				      (char *) flp->text.data);
 		    errors++;
 		}
@@@@ -4011,13 +4014,13 @@@@
 
 	    if(n == 0)
 	      q_status_message(SM_ORDER | SM_DING, 3, 5,
-			  "Subscriptions failed, subscribed to no new groups");
+			  "q\\ѡASq\\sոs");
 	    else
 	      q_status_message3(SM_ORDER | (errors ? SM_DING : 0),
 				errors ? 3 : 0,3,
-				"Subscribed to %s new groups%s%s",
+				"q\\ %s ӷsոs%s%s",
 				comatose((long)n),
-				errors ? ", failed on " : "",
+				errors ? "AoͿ~ " : "",
 				errors ? comatose((long)errors) : "");
 
 	    mail_free_stringlist(&folders);
@@@@ -4026,7 +4029,7 @@@@
 	    (void) context_apply(tmp_20k_buf, &subscribe_cntxt, folder);
 	    if(mail_subscribe(NULL, tmp_20k_buf) == 0L){
 		q_status_message1(SM_ORDER | SM_DING, 3, 3,
-				  "Error subscribing to \"%s\"", folder);
+				  "q\\ \"%s\" ɵoͿ~", folder);
 	    }
 	    else if(ALL_FOUND(cntxt)){
 		/*---- Update the screen display data structures -----*/
@@@@ -4040,7 +4043,7 @@@@
 	}
d941 8
a948 4
 	if(folder[0])
-	  q_status_message1(SM_ORDER, 0, 3, "Subscribed to \"%s\"", folder);
+	  q_status_message1(SM_ORDER, 0, 3, "q\\ \"%s\"", folder);
     }
a949 2
     free_fdir(&subscribe_cntxt.dir, 1);
@@@@ -4080,19 +4083,19 @@@@
d951 7
a957 78
     if(NEWS_TEST(fs->context)){
 	q_status_message(SM_ORDER | SM_DING, 3, 3,
-			 "Can't rename bulletin boards or news groups!");
+			 "LkqlGiηsDոsW١I");
 	return(0);
     }
     else if(!folder_total(FOLDERS(fs->context))){
 	q_status_message(SM_ORDER | SM_DING, 0, 4,
-			 "Empty folder collection.  No folder to rename!");
+			 "ŪƧX`CSiѧWƧXI");
 	return(0);
     }
     else if((new_f = folder_entry(fs->folder_index, FOLDERS(fs->context)))
 	    && (!strucmp(FLDR_NAME(new_f), ps_global->inbox_name)
 		|| new_f->parent)) {
         q_status_message1(SM_ORDER | SM_DING, 3, 4,
-			  "Can't change special folder name \"%s\"",
+			  "LkSƧX \"%s\" W",
 			  new_f->parent
 			    ? new_f->nickname
 			    : ps_global->inbox_name);
@@@@ -4108,11 +4111,11 @@@@
 
     ren_cur = strcmp(folder, ps_global->cur_folder) == 0;
 
-    sprintf(prompt, "Rename %s to : ",
+    sprintf(prompt, "N %s WG",
 	    (fs->context->use & CNTXT_INCMNG)
-	      ? "nickname"
+	      ? "ʺ"
 	      : (isdir = new_f->isdir)
-		  ? "directory" : "folder");
+		  ? "ؿ" : "ƧX");
     help   = NO_HELP;
     strcpy(new_name, folder);
     while(1) {
@@@@ -4133,7 +4136,7 @@@@
 	    if(!ps_global->show_dot_names && *new_name == '.'){
 		if(cnt++ <= 0)
                   q_status_message(SM_ORDER,3,3,
-		    "Folder name can't begin with dot");
+		    "ƧXHI \".\" Wٶ}Y");
 		else{
 		    NAMEVAL_S *feat;
 		    int i;
@@@@ -4143,7 +4146,7 @@@@
 		      ;/* do nothing */
 
 		    q_status_message1(SM_ORDER,3,3,
-		      "Config feature \"%s\" enables names beginning with dot",
+		      "]wɤ \"%s\" \\iϸƧXHI \".\" Wٶ}Y",
 		      feat && feat->name ? feat->name : "");
 		}
 
@@@@ -4153,13 +4156,13 @@@@
 
 	    if(folder_index(new_name, fs->context, FI_ANY) >= 0){
                 q_status_message1(SM_ORDER, 3, 3,
-				  "Folder \"%s\" already exists",
+				  "ƧX \"%s\" wsb",
                                   pretty_fn(new_name));
                 display_message(NO_OP_COMMAND);
                 continue;
             }
 	    else if(!strucmp(new_name, ps_global->inbox_name)){
-                q_status_message1(SM_ORDER, 3, 3, "Can't rename folder to %s",
+                q_status_message1(SM_ORDER, 3, 3, "LkNƧXW %s",
 				  ps_global->inbox_name);
                 display_message(NO_OP_COMMAND);
                 continue;
@@@@ -4182,7 +4185,7 @@@@
     if(rc == 1
        || !(*new_name || (fs->context->use & CNTXT_INCMNG))
        || !strcmp(new_name, folder)){
-        q_status_message(SM_ORDER, 0, 2, "Folder rename cancelled");
+        q_status_message(SM_ORDER, 0, 2, "ƧXW");
         return(0);
     }
a958 53
@@@@ -4264,7 +4267,7 @@@@
 	    /* renaming sent-mail or saved-messages */
 	    if(context_create(fs->context, NULL, folder)){
 		q_status_message3(SM_ORDER,0,3,
-		     "Folder \"%s\" renamed to \"%s\". New \"%s\" created",
+		     "ƧX \"%s\" W٧אּ \"%s\"Cإ߷s \"%s\"",
 				  folder, new_name,
 				  pretty_fn(
 				    (strcmp(ps_global->VAR_DEFAULT_SAVE_FOLDER,
@@@@ -4275,7 +4278,7 @@@@
 	    }
 	    else{
 		q_status_message1(SM_ORDER | SM_DING, 3, 4,
-				  "Error creating new \"%s\"", folder);
+				  "إ߷sƧX \"%s\" ɵoͿ~", folder);
 
 		dprint(2, (debugfile, "Error creating \"%s\" in %s context\n",
 			   folder, fs->context->context));
@@@@ -4283,7 +4286,7 @@@@
 	}
 	else
 	  q_status_message2(SM_ORDER, 0, 3,
-			    "Folder \"%s\" renamed to \"%s\"",
+			    "ƧX \"%s\" W٧אּ \"%s\"",
 			    pretty_fn(folder), pretty_fn(new_name));
 
 	/* Rebuild folder list */
@@@@ -4332,7 +4335,7 @@@@
     int         ret, close_opened = 0, blast_folder = 1;
 
     if(NEWS_TEST(fs->context)){
-	static char fmt[] = "Really unsubscribe from \"%.*s\"";
+	static char fmt[] = "Tw \"%.*s\" Ѱq\\";
          
         folder = folder_entry(fs->folder_index, FOLDERS(fs->context))->name;
 	/* 4 is strlen("%.*s") */
@@@@ -4354,7 +4357,7 @@@@
 	(void) context_apply(tmp_20k_buf, fs->context, folder);
 	if(!mail_unsubscribe(NULL, tmp_20k_buf)){
             q_status_message1(SM_ORDER | SM_DING, 3, 3,
-			      "Error unsubscribing from \"%s\"", folder);
+			      " \"%s\" q\\ɵoͿ~", folder);
             return(0);
         }
 
@@@@ -4372,7 +4375,7 @@@@
 
     if(!folder_total(FOLDERS(fs->context))){
 	q_status_message(SM_ORDER | SM_DING, 0, 4,
-			 "Empty folder collection.  No folder to delete!");
+			 "ŪƧX`CSFiѧRI");
 	return(0);
     }
d960 7
a966 1
@@@@ -4382,12 +4385,12 @@@@
a967 14
     if(ps_global->readonly_pinerc && (fs->context->use & CNTXT_INCMNG)){
 	q_status_message(SM_ORDER,3,5,
-			 "Deletion cancelled: config file not editable");
+			 "RGLks]w");
 	return(0);
     }
     else if(strucmp(folder, ps_global->inbox_name) == 0 || fp->parent) {
 	q_status_message1(SM_ORDER | SM_DING, 3, 4,
-		 "Can't delete special folder \"%s\".", ps_global->inbox_name);
+		 "LkRSƧX \"%s\"C", ps_global->inbox_name);
 	return(0);
     }
     else if(fs->context == ps_global->context_current
@@@@ -4402,7 +4405,7 @@@@
d969 24
a992 17
 	if(ret){
 	    q_status_message1(SM_ORDER | SM_DING, 3, 4,
-			      "Can't delete non-empty directory \"%s\".",
+			      "LkRDŪؿ \"%s\"C",
 			      folder);
 	    return(0);
 	}
@@@@ -4413,19 +4416,19 @@@@
 	 */
 	if(folder_index(folder, fs->context, FI_FOLDER) >= 0
 	   && (ret = want_to(DIR_FOLD_PMT,'n','x',NO_HELP,WT_NORM)) != 'y'){
-	    q_status_message(SM_ORDER,0,3, (ret == 'x') ? "Delete cancelled" 
-			     : "No folder deleted");
+	    q_status_message(SM_ORDER,0,3, (ret == 'x') ? "R" 
+			     : "SƧXQR");
 	    return(0);
 	}
d995 45
a1039 15
     if(fs->context->use & CNTXT_INCMNG){
 	static ESCKEY_S delf_opts[] = {
-	    {'n', 'n', "N", "Nickname only"},
-	    {'b', 'b', "B", "Both Folder and Nickname"},
+	    {'n', 'n', "N", "Ȧʺ"},
+	    {'b', 'b', "B", "ƧXPʺ"},
 	    {-1, 0, NULL, NULL}
 	};
-#define	DELF_PROMPT	"DELETE only Nickname or Both nickname and folder? "
+#define	DELF_PROMPT	"RuȦʺ١vΡuƧXPʺ١vH"
 
 	switch(radio_buttons(DELF_PROMPT, -FOOTER_ROWS(ps_global),
 			     delf_opts,'n','x',NO_HELP,RB_NORM)){
@@@@ -4434,7 +4437,7 @@@@
 	    break;
d1041 6
a1046 7
 	  case 'x' :
-	    cmd_cancelled("Delete");
+	    cmd_cancelled("R");
 	    return(0);
 
 	  default :
@@@@ -4442,13 +4445,13 @@@@
d1048 9
a1056 15
     }
     else{
-	sprintf(ques_buf, "DELETE \"%s\"%s", folder, 
-		close_opened ? " (the currently open folder)"
-			     : fp->isdir ? " (a directory)" : "");
+	sprintf(ques_buf, "R \"%s\"%s", folder, 
+		close_opened ? " (ثe}ҪƧX)"
+			     : fp->isdir ? " (ؿ)" : "");
 
 	if((ret = want_to(ques_buf, 'n', 'x', NO_HELP, WT_NORM)) != 'y'){
-	    q_status_message(SM_ORDER,0,3, (ret == 'x') ? "Delete cancelled" 
-			     : "No folder deleted");
+	    q_status_message(SM_ORDER,0,3, (ret == 'x') ? "R" 
+			     : "SƧXQR");
 	    return(0);
d1058 2
a1059 10
     }
@@@@ -4491,13 +4494,13 @@@@
 /*
  * BUG: what if sent-mail or saved-messages????
  */
-	    q_status_message1(SM_ORDER,3,3,"Delete of \"%s\" Failed!", folder);
+	    q_status_message1(SM_ORDER,3,3,"R \"%s\" ѡI", folder);
 	    return(0);
 	}
     }
d1061 5
a1065 22
-    q_status_message2(SM_ORDER, 0, 3, "%s \"%s\" deleted!",
-		      blast_folder ? "Folder" : "Nickname", folder);
+    q_status_message2(SM_ORDER, 0, 3, "%s \"%s\" wQRI",
+		      blast_folder ? "ƧX" : "ʺ", folder);
 
 
     if(fs->context->use & CNTXT_INCMNG){
@@@@ -4642,7 +4645,7 @@@@
     int  flags;
 
     pat[0] = '\0';
-    sprintf(prompt, "String in folder %s to match : ", kind);
+    sprintf(prompt, "ƧX %s ŦXrG", kind);
 
     while(1){
 	flags = OE_APPEND_CURRENT | OE_DISALLOW_HELP;
@@@@ -4658,7 +4661,7 @@@@
 	      return(1);
 
 	  case 1 :
-	    cmd_cancelled("Select");
+	    cmd_cancelled("");
d1067 22
a1088 5
 	  default :
 	    return(0);
@@@@ -4734,7 +4737,7 @@@@
 	  return(1);
     }
d1090 16
a1105 4
-    cmd_cancelled("Select");
+    cmd_cancelled("");
     return(0);
 }
d1107 3
a1109 12
@@@@ -4767,7 +4770,7 @@@@
     if(!strucmp(folder = f->name, ps_global->inbox_name))
       return(FEX_ISFILE);
 
-    sprintf(tmp, "Scanning \"%.*s\"", 40, FLDR_NAME(f));
+    sprintf(tmp, "by \"%.*s\"", 40, FLDR_NAME(f));
     we_cancel = busy_alarm(1, tmp, NULL, 0);
 
     mm_list_info	      = &ldata;		/* tie down global reference */
@@@@ -4910,7 +4913,7 @@@@
 	  return(1);
     }
d1111 89
a1199 4
-    cmd_cancelled("Select");
+    cmd_cancelled("");
     return(0);
 }
d1201 4
a1204 25
@@@@ -4932,7 +4935,7 @@@@
     while(1){
 	flags = OE_APPEND_CURRENT | OE_DISALLOW_HELP;
 	sprintf(number, "%ld", *count);
-	sprintf(prompt, "Select folders with messages %s : ", tense[*cmp]);
+	sprintf(prompt, "ܦH %s ƧXG", tense[*cmp]);
 	r = optionally_enter(number, -FOOTER_ROWS(ps_global), 0, 31,
 			     prompt, sel_num_opt, NO_HELP, &flags);
 	switch (r){
@@@@ -4941,7 +4944,7 @@@@
 	      break;
 	    else if((*count = atol(number)) < 0L)
 	      q_status_message(SM_ORDER, 3, 3,
-			       "Can't have NEGATIVE message count!");
+			       "iutvHƶqI");
 	    else
 	      return(1);	/* success */
 
@@@@ -5102,7 +5105,7 @@@@
 	    for(; i >= 0; i--)
 	      folder_entry(i, FOLDERS(fs->context))->scanned = 0;
 
-	    cmd_cancelled("Select");
+	    cmd_cancelled("");
 	    rv = 0;
a1206 16
@@@@ -5147,14 +5150,14 @@@@
     int             rc, t_index, done = 0;
     static char     search_string[MAX_SEARCH+1];
     static ESCKEY_S search_keys[] = {{0, 0, NULL, NULL},
-				     {ctrl('Y'), 10, "^Y","First Fldr"},
-				     {ctrl('V'), 11, "^V","Last Fldr"},
+				     {ctrl('Y'), 10, "^Y","Ĥ@@ӸƧX"},
+				     {ctrl('V'), 11, "^V","̫@@ӸƧX"},
 				     {-1, 0, NULL, NULL} };
 
     nsearch_string[0] = '\0';
     if(!folder_total(FOLDERS(fd->context))){
 	q_status_message(SM_ORDER | SM_DING, 0, 4,
-			 "Empty folder collection.  No folders to search!");
+			 "ŪƧX`CSFiѷjMI");
 	return(0);
d1209 4
a1212 10
@@@@ -5162,7 +5165,7 @@@@
 	    search_keys[0].ch    = ctrl('X');
 	    search_keys[0].rval  = 9;
 	    search_keys[0].name  = "^X";
-	    search_keys[0].label = "List Matches";
+	    search_keys[0].label = "CXŦX";
 	}
 	else{
 	    search_keys[0].ch    = 0;
@@@@ -5173,7 +5176,7 @@@@
d1215 73
a1287 43
     t_index = fd->folder_index;
-    sprintf(prompt, "Folder name to search for %s%s%s: ", 
+    sprintf(prompt, "jMƧXW %s%s%sG", 
 	    (*search_string == '\0') ? "" : "[", 
 	    search_string,
 	    (*search_string == '\0') ? "" : "] ");
@@@@ -5184,7 +5187,7 @@@@
 	switch(optionally_enter(nsearch_string, ask_line, 0, MAX_SEARCH,
 				prompt, search_keys, help, &flags)){
 	  case -1 :
-	    q_status_message(SM_ORDER | SM_DING, 3, 3, "Error reading word");
+	    q_status_message(SM_ORDER | SM_DING, 3, 3, "ŪrɵoͿ~");
 	    return(0);
 
 	  case 0 :			/*----- Search away ------*/
@@@@ -5241,9 +5244,9 @@@@
 		}
 
 		if(rc){
-		    q_status_message2(SM_ORDER, 0, 3,
-				      "Searched matched %s folder%s",
-				      int2string(count), plural(count));
+		    q_status_message1(SM_ORDER, 0, 3,
+				      "@@ %s ӸƧXŦXjM",
+				      int2string(count));
 		    fd->prev_index = -1;	/* repaint! */
 		}
 
@@@@ -5257,14 +5260,14 @@@@
 	    while((t_index = folder_lister_prev(fd)) >= 0)
 	      fd->folder_index = t_index;
 
-	    q_status_message(SM_ORDER, 0, 3, "Searched to First Folder.");
+	    q_status_message(SM_ORDER, 0, 3, "jMܲĤ@@ӸƧXC");
 	    return(3);
 
 	  case 11 :
 	    while((t_index = folder_lister_next(fd)))
 	      fd->folder_index = t_index;
 
-	    q_status_message(SM_ORDER, 0, 3, "Searched to Last Folder.");
+	    q_status_message(SM_ORDER, 0, 3, "jM̫ܳ@@ӸƧXC");
 	    return(3);
d1289 43
a1331 38
 	  default :
@@@@ -6273,7 +6276,7 @@@@
 
     if(p = context_digest(c_string, dcontext, host, rcontext, view)){
 	q_status_message2(SM_ORDER | SM_DING, 3, 4,
-			  "Bad context, %s : %s", p, c_string);
+			  "~eA%sG%s", p, c_string);
 	fs_give((void **) &c_string);
 	if(nickname)
 	  fs_give((void **)&nickname);
@@@@ -6314,14 +6317,14 @@@@
 
     /* fix up label */
     if(NEWS_TEST(c)){
-	sprintf(tmp_20k_buf, "%sews groups%s%s",
-		(*host) ? "N" : "Local n", (*host) ? " on " : "",
+	sprintf(tmp_20k_buf, "%sոs%s%s",
+		(*host) ? "s" : "as", (*host) ? "  " : "",
 		(*host) ? host : "");
     }
     else{
 	p = srchstr(rcontext, "[]");
-	sprintf(tmp_20k_buf, "%solders%s%s in %.*s%s",
-		(*host) ? "F" : "Local f", (*host) ? " on " : "",
+	sprintf(tmp_20k_buf, "%sƧX%s%sb %.*s%s",
+		(*host) ? "" : "a", (*host) ? "  " : "",
 		(*host) ? host : "", p ? p - rcontext : 0,
 		rcontext, (p && (p - rcontext) > 0) ? "" : "home directory");
     }
@@@@ -7503,7 +7506,7 @@@@
     if(error && num_in_error){
 	cnt_errs = num_in_error;
 	memset((void *)ng_error, 0, (size_t)90);
-	sprintf(ng_error, "Unknown news group%s: ", plural(num_in_error));
+	sprintf(ng_error, "sDոsG");
 	ep = ng_error + strlen(ng_error);
     }
     for(ntmp = nglist; ntmp; ntmp = ntmp->next){
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 51
a51 3
--- pine/mailpart.c.orig	Fri Jun 26 02:28:42 1998
+++ pine/mailpart.c	Wed Jul 15 17:02:34 1998
@@@@ -135,18 +135,18 @@@@
d54 6
a59 11
 	{"<",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},
d62 6
a67 5
 	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},
d70 26
a95 14
@@@@ -155,9 +155,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};
@@@@ -174,11 +174,11 @@@@
 static struct key att_view_keys[] =
d97 8
a104 10
 	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},
d107 2
d110 2
a111 3
@@@@ -194,7 +194,7 @@@@
 	BOUNCE_MENU,
 	NULL_MENU,
d113 34
a146 2
-	{"%", "Print", MC_PRINTMSG,1,{'%'}, KS_PRINT},
+	{"%", "CL", MC_PRINTMSG,1,{'%'}, KS_PRINT},
d148 246
a393 38
 	REPLY_MENU,
 	FORWARD_MENU};
@@@@ -324,12 +324,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 + 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)));
 
     /*
@@@@ -465,7 +465,7 @@@@
 	  break;
 
 	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;
@@@@ -529,7 +529,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";
 	    }
 
 	    if(km_popped){
@@@@ -624,7 +624,7 @@@@
 	    if(ctmp = next_attline(current))
 	      current = ctmp;
d395 3
a397 2
-	      q_status_message(SM_ORDER, 0, 1, "Already on last attachment");
+	      q_status_message(SM_ORDER, 0, 1, "wg̫@@F");
d401 12
a412 3
@@@@ -632,7 +632,7 @@@@
 	    if(ctmp = prev_attline(current))
 	      current = ctmp;
d414 2
a415 2
-	      q_status_message(SM_ORDER, 0, 1, "Already on first attachment");
+	      q_status_message(SM_ORDER, 0, 1, "wgĤ@@ӪF");
d419 28
a446 1
@@@@ -646,7 +646,7 @@@@
d449 4
a452 4
 	      q_status_message(SM_ORDER, 0, 1,
-			       "Already on last page of attachments");
+			       "wgb󪺳̫@@F");
 	    
d455 289
a743 1
@@@@ -667,7 +667,7 @@@@
d745 133
d879 198
a1076 3
 	      q_status_message(SM_ORDER, 0, 1,
-			       "Already on first page of attachments");
+			       "wgb󪺲Ĥ@@F");
d1078 14
d1094 104
a1197 3
@@@@ -1035,7 +1035,7 @@@@
 {
     bitmap_t	 bitmap;
d1199 25
a1223 115
-    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);
 
@@@@ -1204,7 +1204,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}};
@@@@ -1236,7 +1236,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";
     }
 #endif	/* !(DOS || MAC) */
 
@@@@ -1244,7 +1244,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;
@@@@ -1597,7 +1597,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}};
 
@@@@ -1605,7 +1605,7 @@@@
 	opts[i].ch    =  ctrl('I');
 	opts[i].rval  = 11;
 	opts[i].name  = "TAB";
-	opts[i].label = "Complete";
+	opts[i].label = "";
     }
 
     filename[0] = full_filename[0] = '\0';
@@@@ -1670,7 +1670,7 @@@@
     ATTACH_S *ap;
     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}};
 
@@@@ -1678,7 +1678,7 @@@@
 	opts[i].ch    =  ctrl('I');
 	opts[i].rval  = 11;
 	opts[i].name  = "TAB";
-	opts[i].label = "Complete";
+	opts[i].label = "";
     }
 
     filename[0] = full_filename[0] = '\0';
@@@@ -1899,14 +1899,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]);
 
@@@@ -2095,7 +2095,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 */
     }
@@@@ -2270,22 +2270,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";
d1226 10
a1235 2
-	att_view_keymenu.keys[ATV_BACK_KEY].label = "AttchIndex";
+	att_view_keymenu.keys[ATV_BACK_KEY].label = "";
d1238 82
a1319 51
     if(!handles){
@@@@ -2698,10 +2698,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);
 
@@@@ -2763,7 +2763,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;
@@@@ -2849,7 +2849,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;
@@@@ -2946,7 +2946,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);
@@@@ -3027,7 +3027,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,
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@d1 114
a114 50
--- pico/display.c.orig	Sat Jan 31 15:57:10 1998
+++ pico/display.c	Sat Jan 31 16:07:16 1998
@@@@ -76,32 +76,32 @@@@
  * Standard pico keymenus...
  */
 static KEYMENU menu_pico[] = {
-    {"^G", "Get Help", KS_SCREENHELP},	{"^O", "WriteOut", KS_SAVEFILE},
-    {"^R", "Read File", KS_READFILE},	{"^Y", "Prev Pg", KS_PREVPAGE},
-    {"^K", "Cut Text", KS_NONE},	{"^C", "Cur Pos", KS_CURPOSITION},
-    {"^X", "Exit", KS_EXIT},		{"^J", "Justify", KS_JUSTIFY},
-    {"^W", "Where is", KS_WHEREIS},	{"^V", "Next Pg", KS_NEXTPAGE},
+    {"^G", "U", KS_SCREENHELP},	{"^O", "Ȱu@@", KS_SAVEFILE},
+    {"^R", "Ūɮ", KS_READFILE},	{"^Y", "W@@", KS_PREVPAGE},
+    {"^K", "ŤU@@", KS_NONE},	{"^C", "ثem", KS_CURPOSITION},
+    {"^X", "}", KS_EXIT},		{"^J", "q", KS_JUSTIFY},
+    {"^W", "jM", KS_WHEREIS},	{"^V", "U@@", KS_NEXTPAGE},
     {"^U", NULL, KS_NONE},
 #if defined(SPELLER) && !defined(__FreeBSD__)
-    {"^T", "To Spell", KS_SPELLCHK}
+    {"^T", "rˬd", KS_SPELLCHK}
 #else
-    {"^D", "Del Char", KS_NONE}
+    {"^D", "Rr", KS_NONE}
 #endif
 };
 #define	UNCUT_KEY	10
 
 
 static KEYMENU menu_compose[] = {
-    {"^G", "Get Help", KS_SCREENHELP},	{"^X", NULL, KS_SEND},
-    {"^R", "Read File", KS_READFILE},	{"^Y", "Prev Pg", KS_PREVPAGE},
-    {"^K", "Cut Text", KS_NONE},	{"^O", "Postpone", KS_POSTPONE},
-    {"^C", "Cancel", KS_CANCEL},	{"^J", "Justify", KS_JUSTIFY},
-    {NULL, NULL, KS_NONE},		{"^V", "Next Pg", KS_NEXTPAGE},
+    {"^G", "U", KS_SCREENHELP},	{"^X", NULL, KS_SEND},
+    {"^R", "Ūɮ", KS_READFILE},	{"^Y", "W@@", KS_PREVPAGE},
+    {"^K", "ŤU@@", KS_NONE},	{"^O", "ȽwgH", KS_POSTPONE},
+    {"^C", "", KS_CANCEL},		{"^J", "q", KS_JUSTIFY},
+    {NULL, NULL, KS_NONE},		{"^V", "U@@", KS_NEXTPAGE},
     {"^U", NULL, KS_NONE},
 #ifdef	SPELLER
-    {"^T", "To Spell", KS_SPELLCHK}
+    {"^T", "rˬd", KS_SPELLCHK}
 #else
-    {"^D", "Del Char", KS_NONE}
+    {"^D", "Rr", KS_NONE}
 #endif
 };
 #define	EXIT_KEY	1
@@@@ -737,12 +737,12 @@@@
d116 5
d122 2
a123 5
 	    if(lastflag&CFFILL){
-		menu_pico[UNCUT_KEY].label = "UnJustify";
+		menu_pico[UNCUT_KEY].label = "";
 		emlwrite("Can now UnJustify!", NULL);
 		mpresf = HUGE;	/* remove this after next keystroke! */
d126 174
a299 2
-	      menu_pico[UNCUT_KEY].label = "UnCut Text";
+	      menu_pico[UNCUT_KEY].label = "_Rr";
d301 7
a307 58
 	    wkeyhelp(menu_pico);
 	    sgarbk = FALSE;
@@@@ -932,18 +932,18 @@@@
 	  ShowPrompt();
 	else{
 	    menu_compose[EXIT_KEY].label  = (Pmaster->headents)
-					      ? "Send" :"Exit";
+					      ? "eX" :"}";
 	    menu_compose[PSTPN_KEY].name  = (Pmaster->headents)
 					      ? "^O" : NULL;
 	    menu_compose[PSTPN_KEY].label = (Pmaster->headents)
-					      ? "Postpone" : NULL;
+					      ? "ȽwgH" : NULL;
 	    menu_compose[WHERE_KEY].name  = (Pmaster->alt_ed) ? "^_" : "^W";
 	    menu_compose[WHERE_KEY].label = (Pmaster->alt_ed) ? "Alt Edit" 
-							      : "Where is";
+							      : "jM";
 	    KS_OSDATASET(&menu_compose[WHERE_KEY],
 			 (Pmaster->alt_ed) ? KS_ALTEDITOR : KS_WHEREIS);
-	    menu_compose[UNCUT_KEY].label = (thisflag&CFFILL) ? "UnJustify"
-							      : "UnCut Text";
+	    menu_compose[UNCUT_KEY].label = (thisflag&CFFILL) ? ""
+							      : "_Rr";
 	    wkeyhelp(menu_compose);
 #ifdef _WINDOWS
 	    /* When alt editor is available "Where is" is not on the menu
@@@@ -1134,11 +1134,11 @@@@
     }
 
     menu_yesno[1].name  = "Y";
-    menu_yesno[1].label = (dflt == TRUE) ? "[Yes]" : "Yes";
+    menu_yesno[1].label = (dflt == TRUE) ? "[O]" : "O";
     menu_yesno[6].name  = "^C";
     menu_yesno[6].label = "Cancel";
     menu_yesno[7].name  = "N";
-    menu_yesno[7].label = (dflt == FALSE) ? "[No]" : "No";
+    menu_yesno[7].label = (dflt == FALSE) ? "[_]" : "_";
     wkeyhelp(menu_yesno);		/* paint generic menu */
     sgarbk = TRUE;			/* mark menu dirty */
     if(Pmaster && curwp)
@@@@ -1304,7 +1304,7 @@@@
 #endif
 
     menu_mlreply[0].name = "^G";
-    menu_mlreply[0].label = "Get Help";
+    menu_mlreply[0].label = "U";
     KS_OSDATASET(&menu_mlreply[0], KS_SCREENHELP);
     for(j = 0, i = 1; i < 6; i++){	/* insert odd extras */
 	menu_mlreply[i].name = NULL;
@@@@ -1324,7 +1324,7 @@@@
     }
 
     menu_mlreply[6].name = "^C";
-    menu_mlreply[6].label = "Cancel";
+    menu_mlreply[6].label = "";
     KS_OSDATASET(&menu_mlreply[6], KS_NONE);
     for(j = 0, i = 7; i < 12; i++){	/* insert even extras */
 	menu_mlreply[i].name = NULL;
@
