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


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

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

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

1.5
date	98.10.10.04.29.23;	author steve;	state Exp;
branches;
next	1.4;

1.4
date	98.08.09.00.51.26;	author steve;	state Exp;
branches;
next	1.3;

1.3
date	98.07.30.12.30.39;	author vanilla;	state Exp;
branches;
next	1.2;

1.2
date	98.07.21.14.11.39;	author vanilla;	state Exp;
branches;
next	1.1;

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


desc
@@


1.8
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/folder.c.orig	Thu Oct 14 17:19:43 1999
+++ pine/folder.c	Thu Oct 14 17:19:45 1999
@@@@ -58,10 +58,10 @@@@
 #include "headers.h"
 
 
-#define	CLICKHERE	"[ Select Here to See Expanded List ]"
-#define	CLICKHERETOO	"[ ** Empty List **  Select Here to Try Re-Expanding ]"
+#define	CLICKHERE	"[ o̥H˵i}C ]"
+#define	CLICKHERETOO	"[ ** ŪC **  ǫӭsi} ]"
 #define	CLICKHERETOONEWS \
-	"[ ** Empty List **  Use \"A Subscribe\" to subscribe to a newsgroup ]"
+	"[ ** ŪC **  ϥ \"A Subscribe\" ӭq\@@ӷsDոs ]"
 #define	ALL_FOUND(X)	(((X)->dir->status & CNTXT_NOFIND) == 0 && \
 			  ((X)->dir->status & CNTXT_PARTFIND) == 0)
 #define	FLDR_NAME(X)	((X) ? ((X)->nickname ? (X)->nickname : (X)->name) :"")
@@@@ -70,13 +70,13 @@@@
 				FOLDERS((S)->text.handles->h.f.context)) \
 			 : NULL)
 #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~"
 
 #define	mail_list(S, R, N)	mail_list_internal(S, R, N)
 
@@@@ -319,15 +319,15 @@@@
 /*
  * 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_PREV_HANDLE, 3, \
+#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_PREV_HANDLE, 3, \
 					  {'p', ctrl('B'), KEY_LEFT}}, KS_NONE}
-#define NEXTF_MENU {"N", "NextFldr",   {MC_NEXT_HANDLE, 4, \
+#define NEXTF_MENU {"N", "@@ƧX",   {MC_NEXT_HANDLE, 4, \
 					  {'n', ctrl('F'), TAB, KEY_RIGHT}}, \
 					  KS_NONE}
-#define	CIND_MENU  {"I", "CurIndex",   {MC_INDEX,1,{'i'}}, KS_FLDRINDEX}
+#define	CIND_MENU  {"I", "",   {MC_INDEX,1,{'i'}}, KS_FLDRINDEX}
 
 static struct {
        int num_done;
@@@@ -337,8 +337,8 @@@@
 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,
@@@@ -370,15 +370,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,
@@@@ -397,9 +397,9 @@@@
 
 static struct key context_select_keys[] = 
        {HELP_MENU,
-	{"E", "ExitSelect", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+	{"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
 	NULL_MENU,
-	{">", "[View Cltn]",
+	{">", "[˵`]",
 	 {MC_CHOICE, 5, {'v','>','.',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREVC_MENU,
 	NEXTC_MENU,
@@@@ -413,9 +413,9 @@@@
 
 static struct key context_fcc_keys[] = 
        {HELP_MENU,
-	{"E", "ExitSelect", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+	{"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
 	NULL_MENU,
-	{">", "[View Cltn]",
+	{">", "[˵`]",
 	 {MC_CHOICE, 5, {'v','>','.',ctrl('M'),ctrl('J')}}, KS_NONE},
 	PREVC_MENU,
 	NEXTC_MENU,
@@@@ -437,23 +437,23 @@@@
 	NEXTF_MENU,
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
-	{"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,
 	OTHER_MENU,
 	QUIT_MENU,
 	MAIN_MENU,
-	{"V", "[View Fldr]", {MC_OPENFLDR}, KS_NONE},
+	{"V", "[˵ɮקX]", {MC_OPENFLDR}, KS_NONE},
 	GOTO_MENU,
 	CIND_MENU,
 	COMPOSE_MENU,
-	{"%", "Print", {MC_PRINTFLDR,1,{'%'}}, KS_PRINT},
-	{"Z", "ZoomMode", {MC_ZOOM,1,{'z'}}, KS_NONE},
-	{";","Select",{MC_SELECT,1,{';'}},KS_SELECT},
-	{":","SelectCur",{MC_SELCUR,1,{':'}},KS_SELECT},
+	{"%", "CL", {MC_PRINTFLDR,1,{'%'}}, KS_PRINT},
+	{"Z", "YҦ", {MC_ZOOM,1,{'z'}}, KS_NONE},
+	{";","",{MC_SELECT,1,{';'}},KS_SELECT},
+	{":","ܥثe",{MC_SELCUR,1,{':'}},KS_SELECT},
 
 	HELP_MENU,
 	OTHER_MENU,
@@@@ -479,7 +479,7 @@@@
 
 static struct key folder_sel_keys[] =
        {HELP_MENU,
-	{"E", "ExitSelect", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+	{"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
 	NULL_MENU,
 	{NULL, NULL, {MC_CHOICE,3,{0,ctrl('M'),ctrl('J')}},
 	 KS_NONE},
@@@@ -498,14 +498,14 @@@@
 
 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,
 	NEXTPAGE_MENU,
-	{"L", "List Mode", {MC_LISTMODE, 1, {'l'}}, KS_NONE},
+	{"L", "CҦ", {MC_LISTMODE, 1, {'l'}}, KS_NONE},
 	NULL_MENU,
 	NULL_MENU,
 	WHEREIS_MENU};
@@@@ -518,8 +518,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,
@@@@ -562,10 +562,10 @@@@
     fs.agg_ops		= F_ON(F_ENABLE_AGG_OPS, ps_global) != 0;
     fs.relative_path	= 1;
     fs.f.valid		= fl_val_gen;
-    fs.f.title.bar	= "FOLDER LIST";
+    fs.f.title.bar	= "HXC";
     fs.f.title.style    = FolderName;
     fs.f.help.text	= h_folder_maint;
-    fs.f.help.title	= "HELP FOR FOLDERS";
+    fs.f.help.title	= "HXCU";
     fs.km		= &folder_km;
 
     if(context_isambig(ps->cur_folder)){
@@@@ -646,12 +646,12 @@@@
     mailcap_free(); /* free resources we won't be using for a while */
 
     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;
 
@@@@ -694,10 +694,10 @@@@
     fs.context	     = *cntxtp;
     fs.combined_view = !sublist && F_ON(F_CMBND_FOLDER_DISP, ps_global) != 0;
     fs.f.valid	     = fl_val_gen;
-    fs.f.title.bar   = "GOTO: SELECT FOLDER";
+    fs.f.title.bar   = "eGܸƧX";
     fs.f.title.style = FolderName;
     fs.f.help.text   = h_folder_open;
-    fs.f.help.title  = "HELP FOR OPENING FOLDERS";
+    fs.f.help.title  = "}ҸƧXU";
     fs.km	     = &folder_sel_km;
 
     /* If we were provided a string,
@@@@ -706,7 +706,7 @@@@
     if(sublist && *folder && context_isambig(folder)){
 	if((*cntxtp)->use & CNTXT_INCMNG){
 	    q_status_message(SM_ORDER, 0, 3,
-			     "All folders displayed for Incoming Collection");
+			     "ҦƧXQܬӷ`");
 	}
 	else{
 	    folder_sublist_context(folder, *cntxtp, &fake_context,
@@@@ -757,10 +757,10 @@@@
     fs.context	     = *cntxtp;
     fs.combined_view = F_ON(F_CMBND_FOLDER_DISP, ps_global) != 0;
     fs.f.valid	     = fl_val_gen;
-    fs.f.title.bar   = "SAVE: SELECT FOLDER";
+    fs.f.title.bar   = "sɡGܸƧX";
     fs.f.title.style = MessageNumber;
     fs.f.help.text   = h_folder_save;
-    fs.f.help.title  = "HELP FOR SAVING MESSAGES TO FOLDERS";
+    fs.f.help.title  = "NHsJƧXU";
     fs.km	     = &folder_sel_km;
 
     /* If we were provided a string,
@@@@ -769,7 +769,7 @@@@
     if(sublist && *folder && context_isambig(folder)){
 	if((*cntxtp)->use & CNTXT_INCMNG){
 	    q_status_message(SM_ORDER, 0, 3,
-			     "All folders displayed for Incoming Collection");
+			     "ҦƧXQܬӷ`");
 	}
 	else{
 	    folder_sublist_context(folder, *cntxtp, &fake_context,
@@@@ -947,7 +947,7 @@@@
 	/* leave (*new_dir)->ref == NULL */
     }
 
-    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);
 }
 
@@@@ -1147,12 +1147,12 @@@@
 	CONT_SCR_S css;
 
 	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;
 
@@@@ -1224,7 +1224,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, 
@@@@ -1473,10 +1473,10 @@@@
 	else
 	  exists = (i & FEX_ISDIR);
 
-	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 */
@@@@ -1508,7 +1508,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);
@@@@ -1623,7 +1623,7 @@@@
     FSTATE_S *fs;
 {
     if(f->subscribed){
-	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);
     }
@@@@ -1667,7 +1667,7 @@@@
 	}
 	else{
 	    q_status_message(SM_ORDER | SM_DING, 3, 3,
-			     "Formatting Error: Can't create space for list");
+			     "榡ƿ~GLkCإߪŶ");
 	    return(NULL);
 	}
 
@@@@ -1688,7 +1688,7 @@@@
 	    memset(&sargs, 0, sizeof(SCROLL_S));
 	    sargs.text.text = so_text(screen_text);
 	    sargs.text.src  = CharStar;
-	    sargs.text.desc = "folder list";
+	    sargs.text.desc = "HXC";
 	    if(sargs.text.handles = folder_list_handle(fs, handles))
 	      sargs.start.on = Handle;
 
@@@@ -1991,7 +1991,7 @@@@
 	    else if(fp->fs->combined_view
 		    && (F_ON(F_CMBND_SUBDIR_DISP, ps_global)
 			|| !c_list->dir->prev)){
-		static char *emptiness = "[No Folders in Collection]";
+		static char *emptiness = "[`SƧX]";
 
 		gf_puts(folder_list_center_space(emptiness, cols), pc);
 		len = folder_list_write(pc, c_list, -1, emptiness,
@@@@ -2001,7 +2001,7 @@@@
 	else if(fp->fs->combined_view
 		&& (F_ON(F_CMBND_SUBDIR_DISP, ps_global)
 		    || !c_list->dir->prev)){
-	    static char *unexpanded = "[Select Here to See Expanded List]";
+	    static char *unexpanded = "[o̥H˵i}᪺C]";
 
 	    gf_puts(folder_list_center_space(unexpanded, cols), pc);
 	    len = folder_list_write(pc, c_list, -1, unexpanded,
@@@@ -2220,11 +2220,11 @@@@
 		q_status_message(SM_ORDER, 0, 1, LISTMODE_GRIPE);
 	    }
 	    else
-	      q_status_message(SM_ORDER, 0, 4, "Already in List Mode");
+	      q_status_message(SM_ORDER, 0, 4, "wgBCҦ");
 	}
 	else
 	  q_status_message(SM_ORDER, 0, 4,
-			   "No Folders!  Can't enter List Mode");
+			   "SƧXILkiJCҦ");
 
 	break;
 
@@@@ -2250,7 +2250,7 @@@@
 				    sparms->text.handles->h.f.index);
 	else
 	  q_status_message(SM_ORDER, 0, 4,
-			   "No Folders!  Nothing to View");
+			   "SƧXISi˵");
 
 	break;
 
@@@@ -2341,7 +2341,7 @@@@
 	}
 	else
 	  q_status_message(SM_ORDER | SM_DING, 0, 4,
-			   "Empty folder collection.  No folder to rename!");
+			   "ŪƧX`CSiѧWƧXI");
 
 	break;
 		     
@@@@ -2351,7 +2351,7 @@@@
 	if(!(sparms->text.handles
 		 && folder_total(FOLDERS(sparms->text.handles->h.f.context)))){
 	    q_status_message(SM_ORDER | SM_DING, 0, 4,
-			     "Empty folder collection.  No folder to delete!");
+			     "ŪƧX`CSiѧRƧXI");
 	}
 	else{
 	    char next_folder[MAILTMPLEN+1];
@@@@ -2455,7 +2455,7 @@@@
 	}
 	else
 	  q_status_message(SM_ORDER | SM_DING, 0, 4,
-			   "Empty folder collection.  No folder to select!");
+			   "ŪƧX`CSiѿܪƧXI");
 
 	break;
 
@@@@ -2471,11 +2471,11 @@@@
 		if(sparms->text.handles->h.f.context->use & CNTXT_ZOOM){
 		    sparms->text.handles->h.f.context->use &= ~CNTXT_ZOOM;
 		    q_status_message(SM_ORDER, 0, 3,
-				     "Folder List Zoom mode is now off");
+				     "ƧXCYҦثeA");
 		}
 		else{
 		    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));
 		    sparms->text.handles->h.f.context->use |= CNTXT_ZOOM;
 		}
@@@@ -2495,10 +2495,10 @@@@
 	    }
 	    else
 	      q_status_message(SM_ORDER, 0, 3,
-			       "No selected folders to Zoom on");
+			       "|ܨѩjƧXC");
 	}
 	else
-	  q_status_message(SM_ORDER, 0, 4, "No Folders to Zoom on!");
+	  q_status_message(SM_ORDER, 0, 4, "SiѩjƧXI");
 
 	break;
 
@@@@ -2611,7 +2611,7 @@@@
       empty++;
 
     if(empty)
-      q_status_message(SM_ORDER | SM_DING, 3, 3, "Empty folder list!");
+      q_status_message(SM_ORDER | SM_DING, 3, 3, "ŪƧXCI");
 
     return(rv);
 }
@@@@ -2652,14 +2652,14 @@@@
 	 ? sparms->text.handles->h.f.context->dir->prev
 	 : FPROC(sparms)->fs->context->dir->prev){
 	sparms->keys.menu->keys[KM_COL_KEY].bind.ch[0] = 'e';
-	sparms->keys.menu->keys[KM_COL_KEY].label      = "ParentDir";
+	sparms->keys.menu->keys[KM_COL_KEY].label      = "Whؿ";
 	sparms->keys.menu->keys[KM_COL_KEY].bind.cmd   = MC_PARENT;
     }
     else if((FPROC(sparms)->fs->context->next
 	     || FPROC(sparms)->fs->context->prev)
 	    && !FPROC(sparms)->fs->combined_view){
 	sparms->keys.menu->keys[KM_COL_KEY].bind.ch[0] = 'e';
-	sparms->keys.menu->keys[KM_COL_KEY].label      = "ClctnList";
+	sparms->keys.menu->keys[KM_COL_KEY].label      = "`C";
 	sparms->keys.menu->keys[KM_COL_KEY].bind.cmd   = MC_EXIT;
     }
     else{
@@@@ -2671,7 +2671,7 @@@@
 	sparms->keys.menu->keys[KM_MAIN_KEY].bind.cmd = MC_NONE;
 	sparms->keys.menu->keys[KM_MAIN_KEY].bind.nch = 0;
 
-	sparms->keys.menu->keys[KM_COL_KEY].label      = "Main Menu";
+	sparms->keys.menu->keys[KM_COL_KEY].label      = "D";
 	sparms->keys.menu->keys[KM_COL_KEY].bind.cmd   = MC_MAIN;
 	sparms->keys.menu->keys[KM_COL_KEY].bind.ch[0] = 'm';
     }
@@@@ -2687,7 +2687,7 @@@@
 			     FOLDERS(sparms->text.handles->h.f.context)))){
 	if(fp->isdir){
 	    if(fp->isfolder){
-		sparms->keys.menu->keys[KM_SEL_KEY].label = "View Dir";
+		sparms->keys.menu->keys[KM_SEL_KEY].label = "˵ؿ";
 		menu_clear_binding(sparms->keys.menu, 'v');
 		menu_clear_binding(sparms->keys.menu, ctrl('M'));
 		menu_clear_binding(sparms->keys.menu, ctrl('J'));
@@@@ -2697,7 +2697,7 @@@@
 		setbitn(KM_ALTVIEW_KEY, sparms->keys.bitmap);
 	    }
 	    else{
-		sparms->keys.menu->keys[KM_SEL_KEY].label = "[View Dir]";
+		sparms->keys.menu->keys[KM_SEL_KEY].label = "[˵ؿ]";
 		menu_add_binding(sparms->keys.menu, 'v', MC_CHOICE);
 		menu_add_binding(sparms->keys.menu, ctrl('M'), MC_CHOICE);
 		menu_add_binding(sparms->keys.menu, ctrl('J'), MC_CHOICE);
@@@@ -2705,7 +2705,7 @@@@
 	    }
 	}
 	else{
-	    sparms->keys.menu->keys[KM_SEL_KEY].label = "[View Fldr]";
+	    sparms->keys.menu->keys[KM_SEL_KEY].label = "[˵ƧX]";
 	    menu_add_binding(sparms->keys.menu, 'v', MC_CHOICE);
 	    menu_add_binding(sparms->keys.menu, ctrl('M'), MC_CHOICE);
 	    menu_add_binding(sparms->keys.menu, ctrl('J'), MC_CHOICE);
@@@@ -2715,7 +2715,7 @@@@
     else if(FPROC(sparms)->fs->combined_view
 	    && sparms->text.handles && sparms->text.handles->h.f.context
 	    && !sparms->text.handles->h.f.context->dir->prev){
-	sparms->keys.menu->keys[KM_SEL_KEY].label = "[View Cltn]";
+	sparms->keys.menu->keys[KM_SEL_KEY].label = "[˵`]";
 	menu_add_binding(sparms->keys.menu, 'v', MC_CHOICE);
 	menu_add_binding(sparms->keys.menu, ctrl('M'), MC_CHOICE);
 	menu_add_binding(sparms->keys.menu, ctrl('J'), MC_CHOICE);
@@@@ -2758,7 +2758,7 @@@@
 	 ? sparms->text.handles->h.f.context->dir->prev
 	 : FPROC(sparms)->fs->context->dir->prev){
 	sparms->keys.menu->keys[FC_COL_KEY].name       = "<";
-	sparms->keys.menu->keys[FC_COL_KEY].label      = "ParentDir";
+	sparms->keys.menu->keys[FC_COL_KEY].label      = "Whؿ";
 	sparms->keys.menu->keys[FC_COL_KEY].bind.cmd   = MC_PARENT;
 	sparms->keys.menu->keys[FC_COL_KEY].bind.ch[0] = '<';
 	sparms->keys.menu->keys[FC_COL_KEY].bind.ch[1] = ',';
@@@@ -2774,7 +2774,7 @@@@
 	     || FPROC(sparms)->fs->context->prev)
 	    && !FPROC(sparms)->fs->combined_view){
 	sparms->keys.menu->keys[FC_COL_KEY].name       = "<";
-	sparms->keys.menu->keys[FC_COL_KEY].label      = "ClctnList";
+	sparms->keys.menu->keys[FC_COL_KEY].label      = "`C";
 	sparms->keys.menu->keys[FC_COL_KEY].bind.cmd   = MC_COLLECTIONS;
 	sparms->keys.menu->keys[FC_COL_KEY].bind.ch[0] = '<';
 	sparms->keys.menu->keys[FC_COL_KEY].bind.ch[1] = ',';
@@@@ -2791,7 +2791,7 @@@@
 	 * turn off "ExitSelect" in first slot
 	 */
 	sparms->keys.menu->keys[FC_COL_KEY].name       = "E";
-	sparms->keys.menu->keys[FC_COL_KEY].label      = "ExitSelect";
+	sparms->keys.menu->keys[FC_COL_KEY].label      = "}";
 	sparms->keys.menu->keys[FC_COL_KEY].bind.cmd   = MC_EXIT;
 	sparms->keys.menu->keys[FC_COL_KEY].bind.nch   = 1;
 	sparms->keys.menu->keys[FC_COL_KEY].bind.ch[0] = 'e';
@@@@ -2803,7 +2803,7 @@@@
 			     FOLDERS(sparms->text.handles->h.f.context)))
        && fp->isdir){
 	sparms->keys.menu->keys[FC_SEL_KEY].name  = ">";
-	sparms->keys.menu->keys[FC_SEL_KEY].label = "[View Dir]";
+	sparms->keys.menu->keys[FC_SEL_KEY].label = "[˵ؿ]";
 	menu_clear_binding(sparms->keys.menu, 's');
 	menu_add_binding(sparms->keys.menu, 'v', MC_CHOICE);
 	menu_add_binding(sparms->keys.menu, '>', MC_CHOICE);
@@@@ -2813,7 +2813,7 @@@@
     }
     else{
 	sparms->keys.menu->keys[FC_SEL_KEY].name       = "S";
-	sparms->keys.menu->keys[FC_SEL_KEY].label      = "[Select]";
+	sparms->keys.menu->keys[FC_SEL_KEY].label      = "[]";
 	menu_clear_binding(sparms->keys.menu, 'v');
 	menu_clear_binding(sparms->keys.menu, '>');
 	menu_clear_binding(sparms->keys.menu, '.');
@@@@ -2851,14 +2851,14 @@@@
     if(FPROC(sparms)->fs->list_cntxt){
 	clrbitn(SB_LIST_KEY, sparms->keys.bitmap);
 	sparms->keys.menu->keys[SB_SEL_KEY].name = "X";
-	sparms->keys.menu->keys[SB_SEL_KEY].label = "[Set/Unset]";
+	sparms->keys.menu->keys[SB_SEL_KEY].label = "[]w/]w]";
 	sparms->keys.menu->keys[SB_SEL_KEY].bind.cmd = MC_SELCUR;
 	sparms->keys.menu->keys[SB_SEL_KEY].bind.ch[0] = 'x';
     }
     else{
 	clrbitn(SB_SUB_KEY, sparms->keys.bitmap);
 	sparms->keys.menu->keys[SB_SEL_KEY].name = "S";
-	sparms->keys.menu->keys[SB_SEL_KEY].label = "[Subscribe]";
+	sparms->keys.menu->keys[SB_SEL_KEY].label = "[q\\]";
 	sparms->keys.menu->keys[SB_SEL_KEY].bind.cmd = MC_CHOICE;
 	sparms->keys.menu->keys[SB_SEL_KEY].bind.ch[0] = 's';
     }
@@@@ -2934,7 +2934,7 @@@@
 
 	  default :
 	    q_status_message(SM_ORDER | SM_DING, 3, 3,
-			     "Unsupported Select option");
+			     "䴩ﶵ");
 	    return(0);
 	}
     }
@@@@ -2948,7 +2948,7 @@@@
      */
     switch(q){
       case 'x':				/* cancel */
-	cmd_cancelled("Select command");
+	cmd_cancelled("RO");
 	return(0);
 
       case 'c' :			/* toggle current's selected state */
@@@@ -2959,10 +2959,10 @@@@
 	for(total = i = 0; i < n; i++)
 	  folder_entry(i, FOLDERS(context))->selected = old_tot == 0;
 
-	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);
 
       case 't' :			/* Text */
@@@@ -2979,7 +2979,7 @@@@
 
       default :
 	q_status_message(SM_ORDER | SM_DING, 3, 3,
-			 "Unsupported Select option");
+			 "䴩ﶵ");
 	return(0);
     }
 
@@@@ -3007,34 +3007,30 @@@@
 
     if(!(diff = (total = selected_folders(context)) - 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 ? "Sy"
+			      : "ISH",
+			    comatose(old_tot));
 	else if(old_tot && j)
 	  q_status_message(SM_ORDER, 0, 2,
-		   "No change resulted.  Matching folders already selected.");
+		   "Syܡ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ܡC",
 		(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));
 
     return(1);
 }
@@@@ -3221,9 +3217,9 @@@@
 	fp->prev	  = context->dir;
 	fp->status	 |= CNTXT_SUBDIR;
 	context->dir  = fp;
-	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(context))
-			  ? "" : "EMPTY ",  fp->ref);
+			  ? "" : "Ū ",  fp->ref);
 	rv++;
     }
     else
@@@@ -3242,7 +3238,7 @@@@
     char *p;
 
     /* Provide context in new collection header */
-    sprintf(tmp_20k_buf, "Dir: %s",
+    sprintf(tmp_20k_buf, "ؿG%s",
 	    ((p = strstr(cntxt->context, "%s")) && !*(p+2)
 	     && !strncmp(fdp->ref, cntxt->context, p - cntxt->context))
 	      ? fdp->ref + (p - cntxt->context) : fdp->ref);
@@@@ -3289,12 +3285,12 @@@@
 	context->dir = fp;
 
 	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,
 				      ps_global->ttyo->screen_cols - 22));
 	else
 	  q_status_message(SM_ORDER, 0, 3,
-			   "Returned to collection's top directory");
+			   "^`̤Whؿ");
 
 	rv++;
     }
@@@@ -3483,12 +3479,12 @@@@
     if(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);
 	}
 
@@@@ -3510,7 +3506,7 @@@@
 	else
 	  special_key = NULL;
 
-	sprintf(tmp, "Name of server to contain added folder : ");
+	sprintf(tmp, "]tsWƧXDWG");
 	help = NO_HELP;
 	while(1){
 	    int flags = OE_APPEND_CURRENT;
@@@@ -3528,7 +3524,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)
@@@@ -3538,7 +3534,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];
 
@@@@ -3547,7 +3543,7 @@@@
 	add_folder[++offset] = '\0';		/* +2, total */
     }
     else
-      sprintf(tmp, "Folder name to add : ");
+      sprintf(tmp, "sWƧXW١G");
 
     help = NO_HELP;
     while(1){
@@@@ -3555,14 +3551,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");
 	}
 
 	flags = OE_APPEND_CURRENT;
@@@@ -3576,10 +3572,10 @@@@
 	    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
 		  q_status_message1(SM_ORDER,3,3,
-		      "Config feature \"%s\" enables names beginning with dot",
+		      "]wɤ \"%s\" \\iϸƧXHI \".\" Wٶ}Y",
 		      feature_list_name(F_ENABLE_DOT_FOLDERS));
 
                 display_message(NO_OP_COMMAND);
@@@@ -3598,7 +3594,7 @@@@
 	    }
 	    else if(*p == context->dir->delim){
 		q_status_message(SM_ORDER|SM_DING, 3, 3,
-				 "Can't have trailing directory delimiters!");
+				 "঳ؿݪj \"/\"I");
 		display_message('X');
 		continue;
 	    }
@@@@ -3620,7 +3616,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);
 	}
     }
@@@@ -3639,7 +3635,7 @@@@
 
     help = NO_HELP;
     if(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;
 
@@@@ -3660,7 +3656,7 @@@@
 	    }
 	    else if(rc == 1 || (rc != 3 && !*nickname)){
 		q_status_message(SM_ORDER,0,2,
-		    "Addition of new folder cancelled");
+		    "sWƧX");
 		return(FALSE);
 	    }
 	}
@@@@ -3675,7 +3671,7 @@@@
 	    f = folder_entry(offset, FOLDERS(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);
 	    }
@@@@ -3728,18 +3724,18 @@@@
 	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;
     }
     else if(context_isambig(add_folder)){
 	free_folder_list(context);
-	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);
 	return_val = add_folder;
     }
     else
       q_status_message1(SM_ORDER, 0, 3,
-			"Folder \"%s\" created outside current collection",
+			"ƧX \"%s\" إߩثe`~",
 			add_folder);
 
     return(return_val != NULL);
@@@@ -3778,13 +3774,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 = "";
     }
 
     subscribe_keys[i].ch = -1;
@@@@ -3845,7 +3841,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;
 	    }
 
@@@@ -3898,10 +3894,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);
 		free_folder_list(&subscribe_cntxt);
 
@@@@ -3946,7 +3942,7 @@@@
     if(rc < 0){
 	folder[0] = '\0';		/* make sure not to return partials */
 	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 -----*/
@@@@ -3968,7 +3964,7 @@@@
 		     */
 		    q_status_message1(errors ?SM_INFO : SM_ORDER,
 				      errors ? 0 : 3, 3,
-				      "Error subscribing to \"%s\"",
+				      "q\\ \"%s\" ɵoͿ~",
 				      (char *) flp->name);
 		    errors++;
 		}
@@@@ -3992,13 +3988,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) : "");
 
 	    free_strlist(&folders);
@@@@ -4007,7 +4003,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 -----*/
@@@@ -4021,7 +4017,7 @@@@
 	}
 
 	if(folder[0])
-	  q_status_message1(SM_ORDER, 0, 3, "Subscribed to \"%s\"", folder);
+	  q_status_message1(SM_ORDER, 0, 3, "q\\ \"%s\"", folder);
     }
 
     free_fdir(&subscribe_cntxt.dir, 1);
@@@@ -4062,19 +4058,19 @@@@
 
     if(NEWS_TEST(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(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(index, FOLDERS(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);
@@@@ -4090,11 +4086,11 @@@@
 
     ren_cur = strcmp(folder, ps_global->cur_folder) == 0;
 
-    sprintf(prompt, "Rename %s to : ",
+    sprintf(prompt, "N %s WG",
 	    (context->use & CNTXT_INCMNG)
-	      ? "nickname"
+	      ? "ʺ"
 	      : (isdir = new_f->isdir)
-		  ? "directory" : "folder");
+		  ? "ؿ" : "ƧX");
     help   = NO_HELP;
     strcpy(new_name, folder);
     while(1) {
@@@@ -4115,10 +4111,10 @@@@
 	    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
 		  q_status_message1(SM_ORDER,3,3,
-		      "Config feature \"%s\" enables names beginning with dot",
+		      "]wɤ \"%s\" \\iϸƧXHI \".\" Wٶ}Y",
 		      feature_list_name(F_ENABLE_DOT_FOLDERS));
 
                 display_message(NO_OP_COMMAND);
@@@@ -4127,13 +4123,13 @@@@
 
 	    if(folder_index(new_name, 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;
@@@@ -4156,7 +4152,7 @@@@
     if(rc == 1
        || !(*new_name || (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);
     }
 
@@@@ -4237,7 +4233,7 @@@@
 	    /* renaming sent-mail or saved-messages */
 	    if(context_create(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,
@@@@ -4248,7 +4244,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, context->context));
@@@@ -4256,7 +4252,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));
 
 	free_folder_list(context);
@@@@ -4294,7 +4290,7 @@@@
     int         ret, close_opened = 0, blast_folder = 1;
 
     if(NEWS_TEST(context)){
-	static char fmt[] = "Really unsubscribe from \"%.*s\"";
+	static char fmt[] = "Tw \"%.*s\" Ѱq\\";
          
         folder = folder_entry(index, FOLDERS(context))->name;
 	/* 4 is strlen("%.*s") */
@@@@ -4316,7 +4312,7 @@@@
 	(void) context_apply(tmp_20k_buf, 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);
         }
 
@@@@ -4333,12 +4329,12 @@@@
 
     if(ps_global->readonly_pinerc && (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(context == ps_global->context_current
@@@@ -4353,7 +4349,7 @@@@
 
 	if(ret){
 	    q_status_message1(SM_ORDER | SM_DING, 3, 4,
-			      "Can't delete non-empty directory \"%s\".",
+			      "LkRDŪؿ \"%s\"C",
 			      folder);
 	    return(0);
 	}
@@@@ -4364,19 +4360,19 @@@@
 	 */
 	if(folder_index(folder, 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);
 	}
     }
 
     if(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)){
@@@@ -4385,7 +4381,7 @@@@
 	    break;
 
 	  case 'x' :
-	    cmd_cancelled("Delete");
+	    cmd_cancelled("R");
 	    return(0);
 
 	  default :
@@@@ -4393,13 +4389,13 @@@@
 	}
     }
     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);
 	}
     }
@@@@ -4444,13 +4440,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);
 	}
     }
 
-    q_status_message2(SM_ORDER, 0, 3, "%s \"%s\" deleted.",
-		      blast_folder ? "Folder" : "Nickname", folder);
+    q_status_message2(SM_ORDER, 0, 3, "%s \"%s\" wRC",
+		      blast_folder ? "ƧX" : "ʺ", folder);
 
 
     if(context->use & CNTXT_INCMNG){
@@@@ -4539,7 +4535,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;
@@@@ -4557,7 +4553,7 @@@@
 	      return(1);
 
 	  case 1 :
-	    cmd_cancelled("Select");
+	    cmd_cancelled("");
 
 	  default :
 	    return(0);
@@@@ -4629,7 +4625,7 @@@@
 	  return(1);
     }
 
-    cmd_cancelled("Select");
+    cmd_cancelled("");
     return(0);
 }
 
@@@@ -4662,7 +4658,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 */
@@@@ -4800,7 +4796,7 @@@@
 	  return(1);
     }
 
-    cmd_cancelled("Select");
+    cmd_cancelled("");
     return(0);
 }
 
@@@@ -4822,7 +4818,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){
@@@@ -4831,7 +4827,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 */
 
@@@@ -4992,7 +4988,7 @@@@
 	    for(; i >= 0; i--)
 	      folder_entry(i, FOLDERS(context))->scanned = 0;
 
-	    cmd_cancelled("Select");
+	    cmd_cancelled("");
 	    rv = 0;
 	    break;
 	}
@@@@ -5937,7 +5933,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);
@@@@ -5978,14 +5974,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");
     }
@@@@ -7225,7 +7221,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.7
log
@Update to version 4.20.

PR:		14575
Submitted by:	maintainer
@
text
@@


1.6
log
@Update to version 4.10.

PR:		10245
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pine/folder.c.orig	Fri Feb  5 05:47:33 1999
+++ pine/folder.c	Wed Feb 24 02:50:43 1999
d37 1
a37 1
@@@@ -313,21 +313,21 @@@@
d57 3
d70 1
a70 1
@@@@ -359,15 +359,15 @@@@
d90 1
a90 1
@@@@ -386,9 +386,9 @@@@
d102 1
a102 1
@@@@ -402,9 +402,9 @@@@
d114 1
a114 1
@@@@ -426,23 +426,23 @@@@
d137 1
a137 1
-	{":","SelectCur",{MC_SELCUR,1,{':'}},KS_SELECT}};
d141 5
a145 5
+	{":","ܥثe",{MC_SELCUR,1,{':'}},KS_SELECT}};
 INST_KEY_MENU(folder_km, folder_keys);
 #define	KM_COL_KEY	2
 #define	KM_SEL_KEY	3
@@@@ -455,7 +455,7 @@@@
d154 1
a154 1
@@@@ -474,14 +474,14 @@@@
d173 1
a173 1
@@@@ -493,8 +493,8 @@@@
d184 1
a184 1
@@@@ -537,7 +537,7 @@@@
d192 6
a197 2
     fs.f.help.title	= "HELP FOR FOLDERS";
@@@@ -621,12 +621,12 @@@@
d212 1
a212 1
@@@@ -669,10 +669,10 @@@@
d225 1
a225 1
@@@@ -681,7 +681,7 @@@@
d234 1
a234 1
@@@@ -732,10 +732,10 @@@@
d247 1
a247 1
@@@@ -744,7 +744,7 @@@@
d256 1
a256 1
@@@@ -921,7 +921,7 @@@@
d265 1
a265 1
@@@@ -1025,12 +1025,12 @@@@
d280 1
a280 1
@@@@ -1102,7 +1102,7 @@@@
d289 1
a289 1
@@@@ -1347,10 +1347,10 @@@@
d303 1
a303 1
@@@@ -1382,7 +1382,7 @@@@
d312 1
a312 1
@@@@ -1505,7 +1505,7 @@@@
d321 1
a321 1
@@@@ -1549,7 +1549,7 @@@@
d330 1
a330 1
@@@@ -1563,7 +1563,7 @@@@
d339 1
a339 1
@@@@ -1875,7 +1875,7 @@@@
d348 1
a348 1
@@@@ -1885,7 +1885,7 @@@@
d357 1
a357 1
@@@@ -2092,11 +2092,11 @@@@
d371 1
a371 1
@@@@ -2122,7 +2122,7 @@@@
d380 1
a380 1
@@@@ -2206,7 +2206,7 @@@@
d389 1
a389 1
@@@@ -2216,7 +2216,7 @@@@
d396 3
a398 3
 	else if(delete_folder(sparms->text.handles->h.f.context,
 			      sparms->text.handles->h.f.index)){
@@@@ -2336,7 +2336,7 @@@@
d407 1
a407 1
@@@@ -2352,11 +2352,11 @@@@
d421 1
a421 1
@@@@ -2376,10 +2376,10 @@@@
d434 1
a434 1
@@@@ -2469,7 +2469,7 @@@@
d443 1
a443 1
@@@@ -2510,14 +2510,14 @@@@
d460 1
a460 1
@@@@ -2529,7 +2529,7 @@@@
d469 1
a469 1
@@@@ -2545,7 +2545,7 @@@@
d478 1
a478 1
@@@@ -2555,7 +2555,7 @@@@
d487 1
a487 1
@@@@ -2563,7 +2563,7 @@@@
d496 1
a496 1
@@@@ -2573,7 +2573,7 @@@@
d505 1
a505 1
@@@@ -2616,7 +2623,7 @@@@
a511 1
 	sparms->keys.menu->keys[FC_COL_KEY].bind.nch   = 2;
d513 2
a514 1
@@@@ -2627,7 +2634,7 @@@@
a520 1
 	sparms->keys.menu->keys[FC_COL_KEY].bind.nch   = 2;
d522 2
a523 1
@@@@ -2639,7 +2646,7 @@@@
d532 1
a532 1
@@@@ -2651,7 +2658,7 @@@@
d541 1
a541 1
@@@@ -2659,7 +2666,7 @@@@
d550 1
a550 1
@@@@ -2695,14 +2702,14 @@@@
d567 1
a567 1
@@@@ -2778,7 +2785,7 @@@@
d576 1
a576 1
@@@@ -2792,7 +2799,7 @@@@
d585 1
a585 1
@@@@ -2804,10 +2811,10 @@@@
d599 1
a599 1
@@@@ -2824,7 +2831,7 @@@@
d608 1
a608 1
@@@@ -2852,34 +2859,30 @@@@
d655 1
a655 1
@@@@ -2995,9 +2998,9 @@@@
d667 1
a667 1
@@@@ -3016,7 +3019,7 @@@@
d676 1
a676 1
@@@@ -3062,12 +3065,12 @@@@
d691 1
a691 1
@@@@ -3258,12 +3261,12 @@@@
d706 1
a706 1
@@@@ -3285,7 +3288,7 @@@@
d715 1
a715 1
@@@@ -3303,7 +3306,7 @@@@
d724 1
a724 1
@@@@ -3313,7 +3316,7 @@@@
d733 1
a733 1
@@@@ -3322,7 +3325,7 @@@@
d742 1
a742 1
@@@@ -3330,14 +3333,14 @@@@
d761 1
a761 1
@@@@ -3351,10 +3354,10 @@@@
d774 1
a774 1
@@@@ -3373,7 +3376,7 @@@@
d783 1
a783 1
@@@@ -3395,7 +3398,7 @@@@
d792 1
a792 1
@@@@ -3414,7 +3417,7 @@@@
d801 1
a801 1
@@@@ -3435,7 +3438,7 @@@@
d810 1
a810 1
@@@@ -3450,7 +3453,7 @@@@
d819 1
a819 1
@@@@ -3503,18 +3506,18 @@@@
d842 1
a842 1
@@@@ -3553,13 +3556,13 @@@@
d858 1
a858 1
@@@@ -3620,7 +3623,7 @@@@
d867 1
a867 1
@@@@ -3673,10 +3676,10 @@@@
d880 1
a880 1
@@@@ -3721,7 +3724,7 @@@@
d889 1
a889 1
@@@@ -3743,7 +3746,7 @@@@
d898 1
a898 1
@@@@ -3767,13 +3770,13 @@@@
d915 1
a915 1
@@@@ -3782,7 +3785,7 @@@@
d924 1
a924 1
@@@@ -3796,7 +3799,7 @@@@
d933 1
a933 1
@@@@ -3837,19 +3840,19 @@@@
d956 1
a956 1
@@@@ -3865,11 +3868,11 @@@@
d971 1
a971 1
@@@@ -3890,10 +3893,10 @@@@
d984 1
a984 1
@@@@ -3902,13 +3905,13 @@@@
d1000 1
a1000 1
@@@@ -3931,7 +3934,7 @@@@
d1009 1
a1009 1
@@@@ -4012,7 +4015,7 @@@@
d1018 1
a1018 1
@@@@ -4023,7 +4026,7 @@@@
d1027 1
a1027 1
@@@@ -4031,7 +4034,7 @@@@
d1036 1
a1036 1
@@@@ -4068,7 +4071,7 @@@@
d1045 1
a1045 1
@@@@ -4090,7 +4093,7 @@@@
d1054 1
a1054 1
@@@@ -4107,12 +4110,12 @@@@
d1069 1
a1069 1
@@@@ -4127,7 +4130,7 @@@@
d1078 1
a1078 1
@@@@ -4138,19 +4141,19 @@@@
d1103 1
a1103 1
@@@@ -4159,7 +4162,7 @@@@
d1112 1
a1112 1
@@@@ -4167,13 +4170,13 @@@@
d1131 1
a1131 1
@@@@ -4216,13 +4219,13 @@@@
d1148 1
a1148 1
@@@@ -4299,7 +4302,7 @@@@
d1157 1
a1157 1
@@@@ -4317,7 +4320,7 @@@@
d1166 1
a1166 1
@@@@ -4394,7 +4397,7 @@@@
d1175 1
a1175 1
@@@@ -4427,7 +4430,7 @@@@
d1184 1
a1184 1
@@@@ -4571,7 +4574,7 @@@@
d1193 1
a1193 1
@@@@ -4593,7 +4596,7 @@@@
d1202 1
a1202 1
@@@@ -4602,7 +4605,7 @@@@
d1211 1
a1211 1
@@@@ -4763,7 +4766,7 @@@@
d1220 1
a1220 1
@@@@ -5712,7 +5715,7 @@@@
d1229 1
a1229 1
@@@@ -5753,14 +5756,14 @@@@
d1248 1
a1248 1
@@@@ -6986,7 +6989,7 @@@@
@


1.5
log
@Update to version 4.05.

PR:		8025
Submitted by:	maintainer
@
text
@d1 15
a15 4
--- pine/folder.c.orig	Thu Sep 17 01:12:27 1998
+++ pine/folder.c	Tue Sep 22 19:05:59 1998
@@@@ -62,13 +62,13 @@@@
 			  ((X)->dir->status&CNTXT_PARTFIND) == 0)
d17 3
d37 1
a37 1
@@@@ -281,18 +281,18 @@@@
d44 1
a44 3
-#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}
d48 7
a54 2
+#define PREVF_MENU {"P", "e@@ƧX",   {MC_PREVITEM, 1, {'p'}}, KS_NONE}
+#define NEXTF_MENU {"N", "@@ƧX",   {MC_NEXTITEM, 2, {'n',TAB}}, KS_NONE}
d67 1
a67 1
@@@@ -324,15 +324,15 @@@@
d87 1
a87 1
@@@@ -351,9 +351,9 @@@@
d99 1
a99 1
@@@@ -367,9 +367,9 @@@@
d111 1
a111 10
@@@@ -384,16 +384,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,
d123 6
a128 1
@@@@ -405,9 +405,9 @@@@
d131 1
a131 1
 	PRYNTTXT_MENU,
d135 1
d142 1
a142 1
@@@@ -419,9 +419,9 @@@@
a145 25
- 	{"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,
@@@@ -435,9 +435,9 @@@@
 
 static struct key folder_sub_sel_keys[] =
        {HELP_MENU,
- 	{"E", "ExitSelect", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
+ 	{"E", "}", {MC_EXIT,1,{'e'}}, KS_EXITMODE},
 	NULL_MENU,
-        {"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,
@@@@ -451,9 +451,9 @@@@
 
 static struct key folder_fcc_keys[] =
        {HELP_MENU,
a146 2
-	{"<", "Collections", {MC_COLLECTIONS,2,{'<',','}}, KS_NONE},
-	{"S", "[Select]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}},
d148 2
a149 2
+	{"<", "`", {MC_COLLECTIONS,2,{'<',','}}, KS_NONE},
+	{"S", "[]", {MC_CHOICE,3,{'s',ctrl('M'),ctrl('J')}},
d151 1
a151 3
 	PREVF_MENU,
 	NEXTF_MENU,
@@@@ -469,9 +469,9 @@@@
d164 7
a170 1
@@@@ -488,8 +488,8 @@@@
d181 10
a190 1
@@@@ -610,12 +610,12 @@@@
d205 45
a249 1
@@@@ -904,7 +904,7 @@@@
d258 1
a258 1
@@@@ -1003,12 +1003,12 @@@@
d273 1
a273 1
@@@@ -1079,7 +1079,7 @@@@
d282 1
a282 1
@@@@ -1322,10 +1322,10 @@@@
d296 1
a296 1
@@@@ -1357,7 +1357,7 @@@@
d305 1
a305 10
@@@@ -1474,7 +1474,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
@@@@ -1489,7 +1489,7 @@@@
d308 1
a308 1
     if(!strncmp(f->prefix, "SUB", 3)){
d314 38
a351 45
@@@@ -1502,7 +1502,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);
 }
 
@@@@ -1617,7 +1617,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, save_sel = 0;
+		     km_popped = 0, listmode = 0, done = 0, save_sel = 0, exit_to_main = 0;
     unsigned short   new_col;
     FOLDER_S        *cur_f = NULL;
     STRLIST_S	    *sl = NULL;
@@@@ -1748,7 +1748,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';
 		}
@@@@ -1768,14 +1768,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';
 		}
 		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';
 		}
@@@@ -1789,7 +1789,7 @@@@
d353 8
d362 1
a362 19
 	    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')}},
@@@@ -1915,8 +1915,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;
d364 6
a369 27
 	    break;
  
@@@@ -1924,6 +1931,7 @@@@
             /*--------------------- Key right -------------------*/
 	  case MC_CHARRIGHT :
 	  case MC_NEXTITEM :
+	    exit_to_main = 0;
 	    if(n = folder_lister_next(fs))
 	      fs->folder_index = n;
 
@@@@ -1945,7 +1953,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;
@@@@ -1991,7 +1999,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;
 	    }
d371 1
a371 6
@@@@ -2156,7 +2164,7 @@@@
 		  rc++;
 	    }
 	    else
-	      q_status_message(SM_ORDER,0,1,"Already on first page.");
+	      q_status_message(SM_ORDER,0,1,"wgĤ@@FC");
d373 33
a405 9
             break;
 
@@@@ -2169,7 +2177,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");
 		    break;
d407 1
a407 42
 		else
@@@@ -2210,7 +2218,7 @@@@
 	    }
 	    else
 	      q_status_message(SM_ORDER | SM_DING, 3, 3, 
-			       "Sorry, no help text available");
+			       "ܩpArLko");
 
 	    break;
 
@@@@ -2219,7 +2227,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++;
@@@@ -2279,7 +2287,7 @@@@
 		mangled_footer++;
 	    }
 	    else
-	      q_status_message(SM_ORDER, 0, 4, "Already in List Mode");
+	      q_status_message(SM_ORDER, 0, 4, "wgbCҦFC");
 
 	    break;
 
@@@@ -2415,8 +2423,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}");
 		break;
 	    }
 
@@@@ -2494,13 +2502,13 @@@@
 		if(fs->zoomed = !fs->zoomed){	/* clear all the prefixes */
 		    (void) folder_lister_nearest_selected(fs);
d412 1
a412 6
 
 		}
 		else{
 		    q_status_message(SM_ORDER, 0, 3,
-				     "Folder List Zoom mode is now off");
+				     "ƧXCYҦثeA");
d414 1
a414 3
 
 		create_folder_display(fs, ps->ttyo->screen_cols);
@@@@ -2508,7 +2516,7 @@@@
d420 4
d425 1
d427 2
a428 13
 	    break;
@@@@ -2518,16 +2526,16 @@@@
 	  case MC_WHEREIS :
 	    switch(search_folders(fs, -FOOTER_ROWS(ps))){
 	      case -1 :
-		cmd_cancelled("Folder name search");
+		cmd_cancelled("jMɮקXW");
 		break;
 
 	      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;
d430 3
a432 6
 	      case 2 :
 		q_status_message(SM_ORDER, 0, 2,
-				 "Search wrapped to beginning");
+				 "qYjM");
 		break;
 	    }
d434 1
a434 9
@@@@ -2594,8 +2602,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);
d436 46
a481 19
 
@@@@ -2616,8 +2624,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);
 }
 
@@@@ -2632,7 +2640,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));
d484 51
a534 1
@@@@ -2642,7 +2650,7 @@@@
d537 22
a558 13
 	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);
@@@@ -2699,13 +2707,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);
d560 1
a560 9
 
     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)){
@@@@ -2730,7 +2738,7 @@@@
d569 1
a569 1
@@@@ -2744,7 +2752,7 @@@@
d578 3
a580 3
@@@@ -2766,10 +2774,10 @@@@
 	      create_folder_display(fs, ps_global->ttyo->screen_cols);
 	}
d592 1
a592 1
@@@@ -2786,7 +2794,7 @@@@
d601 1
a601 1
@@@@ -2815,35 +2823,30 @@@@
d603 1
a603 1
     if(!(diff = (total = selected_folders(fs)) - old_tot)){
d613 3
a615 2
+			    j ? "SɭP"
+			      : "ISH", comatose(old_tot));
d619 1
a619 1
+		   "SɭPܡCŦXƧXwgQܤFC");
d625 14
a638 1
+			    old_tot ? "B~ " : "");
d640 5
a644 25
     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, "    ");
@@@@ -3031,9 +3034,9 @@@@
 
 	fs->prev_index = -1;		  /* redraw display */
d646 6
d654 1
a654 1
 			  folder_total(FOLDERS(fs->context))
d660 1
a660 1
@@@@ -3052,7 +3055,7 @@@@
d669 2
a670 2
@@@@ -3097,12 +3100,12 @@@@
 	fs->prev_index = -1;		  /* redraw display */
d676 1
a676 1
 				      fs->display_cols - 22));
d684 2
a685 2
@@@@ -3673,12 +3676,12 @@@@
     if(fs->context->use & CNTXT_INCMNG){
d699 1
a699 1
@@@@ -3700,7 +3703,7 @@@@
d708 1
a708 1
@@@@ -3718,7 +3721,7 @@@@
d717 1
a717 1
@@@@ -3728,7 +3731,7 @@@@
d726 1
a726 1
@@@@ -3737,7 +3740,7 @@@@
d735 1
a735 1
@@@@ -3745,14 +3748,14 @@@@
d754 1
a754 1
@@@@ -3766,7 +3769,7 @@@@
d757 5
a761 10
                   q_status_message(SM_ORDER,3,3,
-		    "Folder name can't begin with dot");
+		    "ƧXHI \".\" Wٶ}Y");
 		else{
 		    NAMEVAL_S *feat;
 		    int i;
@@@@ -3776,7 +3779,7 @@@@
 		      ;/* do nothing */
 
 		    q_status_message1(SM_ORDER,3,3,
d764 1
a764 2
 		      feat && feat->name ? feat->name : "");
 		}
d766 2
a767 1
@@@@ -3796,7 +3799,7 @@@@
d769 1
a769 1
 	    else if(*p == fs->context->dir->delim){
d776 1
a776 1
@@@@ -3818,7 +3821,7 @@@@
d785 1
a785 1
@@@@ -3837,7 +3840,7 @@@@
d788 1
a788 1
     if(fs->context->use & CNTXT_INCMNG){
d794 1
a794 1
@@@@ -3858,7 +3861,7 @@@@
d803 2
a804 2
@@@@ -3873,7 +3876,7 @@@@
 	    f = folder_entry(offset, FOLDERS(fs->context));
d812 1
a812 1
@@@@ -3927,7 +3930,7 @@@@
d821 5
a825 10
@@@@ -3943,15 +3946,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);
 	}
 
d835 1
a835 1
@@@@ -3990,13 +3993,13 @@@@
d851 1
a851 1
@@@@ -4057,7 +4060,7 @@@@
d860 1
a860 1
@@@@ -4110,10 +4113,10 @@@@
d873 1
a873 2
@@@@ -4162,7 +4165,7 @@@@
 
d875 1
d882 1
a882 1
@@@@ -4184,7 +4187,7 @@@@
d891 1
a891 1
@@@@ -4208,13 +4211,13 @@@@
d908 1
a908 1
@@@@ -4223,7 +4226,7 @@@@
d917 1
a917 1
@@@@ -4237,7 +4240,7 @@@@
d926 1
a926 1
@@@@ -4277,19 +4280,19 @@@@
d928 1
a928 1
     if(NEWS_TEST(fs->context)){
d934 1
a934 1
     else if(!folder_total(FOLDERS(fs->context))){
d940 1
a940 1
     else if((new_f = folder_entry(fs->folder_index, FOLDERS(fs->context)))
d949 1
a949 1
@@@@ -4305,11 +4308,11 @@@@
d955 1
a955 1
 	    (fs->context->use & CNTXT_INCMNG)
d964 1
a964 1
@@@@ -4330,7 +4333,7 @@@@
d970 2
a971 7
 		else{
 		    NAMEVAL_S *feat;
 		    int i;
@@@@ -4340,7 +4343,7 @@@@
 		      ;/* do nothing */
 
 		    q_status_message1(SM_ORDER,3,3,
d974 1
a974 2
 		      feat && feat->name ? feat->name : "");
 		}
d976 2
a977 1
@@@@ -4350,13 +4353,13 @@@@
d979 1
a979 1
 	    if(folder_index(new_name, fs->context, FI_ANY) >= 0){
d993 1
a993 1
@@@@ -4379,7 +4382,7 @@@@
d995 1
a995 1
        || !(*new_name || (fs->context->use & CNTXT_INCMNG))
d1002 1
a1002 1
@@@@ -4461,7 +4464,7 @@@@
d1004 1
a1004 1
 	    if(context_create(fs->context, NULL, folder)){
d1011 1
a1011 1
@@@@ -4472,7 +4475,7 @@@@
d1019 2
a1020 2
 			   folder, fs->context->context));
@@@@ -4480,7 +4483,7 @@@@
d1028 3
a1030 2
 	/* Rebuild folder list */
@@@@ -4530,12 +4533,12 @@@@
d1032 1
a1032 8
     if(!folder_total(FOLDERS(fs->context))){        
       q_status_message(SM_ORDER | SM_DING, 0, 4,
-		       "Empty folder collection.  No folder to delete!");
+		       "ŪƧXCSFiѧRI");
       return(0);
     }
 
     if(NEWS_TEST(fs->context)){
d1036 1
a1036 1
         folder = folder_entry(fs->folder_index, FOLDERS(fs->context))->name;
d1038 2
a1039 2
@@@@ -4557,7 +4560,7 @@@@
 	(void) context_apply(tmp_20k_buf, fs->context, folder);
d1047 1
a1047 1
@@@@ -4579,12 +4582,12 @@@@
d1049 1
a1049 1
     if(ps_global->readonly_pinerc && (fs->context->use & CNTXT_INCMNG)){
d1061 2
a1062 2
     else if(fs->context == ps_global->context_current
@@@@ -4599,7 +4602,7 @@@@
d1071 1
a1071 1
@@@@ -4610,19 +4613,19 @@@@
d1073 1
a1073 1
 	if(folder_index(folder, fs->context, FI_FOLDER) >= 0
d1083 1
a1083 1
     if(fs->context->use & CNTXT_INCMNG){
d1096 1
a1096 1
@@@@ -4631,7 +4634,7 @@@@
d1105 1
a1105 1
@@@@ -4639,13 +4642,13 @@@@
d1124 1
a1124 1
@@@@ -4688,13 +4691,13 @@@@
d1134 1
a1134 1
-    q_status_message2(SM_ORDER, 0, 3, "%s \"%s\" deleted!",
d1136 1
a1136 1
+    q_status_message2(SM_ORDER, 0, 3, "%s \"%s\" wQRI",
d1140 2
a1141 2
     if(fs->context->use & CNTXT_INCMNG){
@@@@ -4839,7 +4842,7 @@@@
d1150 1
a1150 1
@@@@ -4855,7 +4858,7 @@@@
d1159 1
a1159 1
@@@@ -4931,7 +4934,7 @@@@
d1168 1
a1168 1
@@@@ -4964,7 +4967,7 @@@@
d1177 1
a1177 1
@@@@ -5107,7 +5110,7 @@@@
d1186 1
a1186 1
@@@@ -5129,7 +5132,7 @@@@
d1195 1
a1195 1
@@@@ -5138,7 +5141,7 @@@@
d1204 1
a1204 1
@@@@ -5299,7 +5302,7 @@@@
d1206 1
a1206 1
 	      folder_entry(i, FOLDERS(fs->context))->scanned = 0;
d1213 1
a1213 76
@@@@ -5344,14 +5347,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);
     }
     else{
@@@@ -5359,7 +5362,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;
@@@@ -5370,7 +5373,7 @@@@
     }
 
     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') ? "" : "] ");
@@@@ -5381,7 +5384,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 ------*/
@@@@ -5438,9 +5441,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! */
 		}
 
@@@@ -5454,14 +5457,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);
 
 	  default :
@@@@ -6500,7 +6503,7 @@@@
d1222 1
a1222 1
@@@@ -6541,14 +6544,14 @@@@
d1241 1
a1241 1
@@@@ -7745,7 +7748,7 @@@@
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pine/folder.c.orig	Wed Jul 22 06:01:07 1998
+++ pine/folder.c	Tue Aug  4 12:42:16 1998
d23 1
a23 1
@@@@ -269,18 +269,18 @@@@
d50 1
a50 1
@@@@ -312,15 +312,15 @@@@
d70 1
a70 1
@@@@ -339,9 +339,9 @@@@
d82 1
a82 1
@@@@ -355,9 +355,9 @@@@
d94 1
a94 1
@@@@ -372,16 +372,16 @@@@
d115 1
a115 1
@@@@ -393,9 +393,9 @@@@
d128 1
a128 1
@@@@ -407,9 +407,9 @@@@
d141 1
a141 1
@@@@ -423,9 +423,9 @@@@
d153 1
a153 1
@@@@ -439,9 +439,9 @@@@
d166 1
a166 1
@@@@ -457,9 +457,9 @@@@
d179 1
a179 1
@@@@ -476,8 +476,8 @@@@
d190 1
a190 1
@@@@ -572,12 +572,12 @@@@
d205 1
a205 1
@@@@ -866,7 +866,7 @@@@
d214 1
a214 1
@@@@ -965,12 +965,12 @@@@
d229 1
a229 1
@@@@ -1041,7 +1041,7 @@@@
d238 1
a238 1
@@@@ -1277,10 +1277,10 @@@@
d252 1
a252 1
@@@@ -1312,7 +1312,7 @@@@
d261 1
a261 1
@@@@ -1429,7 +1429,7 @@@@
d270 1
a270 1
@@@@ -1444,7 +1444,7 @@@@
d279 1
a279 1
@@@@ -1457,7 +1457,7 @@@@
d288 1
a288 1
@@@@ -1572,7 +1572,7 @@@@
d292 2
a293 2
-		     km_popped = 0, listmode = 0, done = 0;
+		     km_popped = 0, listmode = 0, done = 0, exit_to_main = 0;
d296 2
a297 2
     STRINGLIST	    *sl = NULL;
@@@@ -1682,7 +1682,7 @@@@
d306 1
a306 1
@@@@ -1702,14 +1702,14 @@@@
d323 1
a323 1
@@@@ -1723,7 +1723,7 @@@@
d332 1
a332 1
@@@@ -1849,8 +1849,15 @@@@
d348 1
a348 1
@@@@ -1858,6 +1865,7 @@@@
d356 1
a356 1
@@@@ -1879,7 +1887,7 @@@@
d365 1
a365 1
@@@@ -1925,7 +1933,7 @@@@
d374 1
a374 1
@@@@ -2044,7 +2052,7 @@@@
d383 1
a383 1
@@@@ -2057,7 +2065,7 @@@@
d392 1
a392 1
@@@@ -2098,7 +2106,7 @@@@
d401 1
a401 1
@@@@ -2107,7 +2115,7 @@@@
d410 1
a410 1
@@@@ -2169,7 +2177,7 @@@@
d419 1
a419 1
@@@@ -2302,8 +2310,8 @@@@
d430 1
a430 1
@@@@ -2381,13 +2389,13 @@@@
d446 1
a446 1
@@@@ -2395,7 +2403,7 @@@@
d455 1
a455 1
@@@@ -2405,16 +2413,16 @@@@
d475 1
a475 1
@@@@ -2475,8 +2483,8 @@@@
d486 1
a486 1
@@@@ -2497,8 +2505,8 @@@@
d497 1
a497 1
@@@@ -2513,7 +2521,7 @@@@
d506 1
a506 1
@@@@ -2523,7 +2531,7 @@@@
d515 1
a515 1
@@@@ -2580,13 +2588,13 @@@@
d531 1
a531 1
@@@@ -2611,7 +2619,7 @@@@
d540 1
a540 1
@@@@ -2625,7 +2633,7 @@@@
d549 1
a549 1
@@@@ -2647,10 +2655,10 @@@@
d563 1
a563 1
@@@@ -2667,7 +2675,7 @@@@
d572 1
a572 1
@@@@ -2696,35 +2704,30 @@@@
d619 1
a619 10
@@@@ -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 @@@@
d631 10
a640 1
@@@@ -2908,12 +2911,12 @@@@
d655 1
a655 1
@@@@ -3479,12 +3482,12 @@@@
d670 1
a670 1
@@@@ -3506,7 +3509,7 @@@@
d679 1
a679 1
@@@@ -3524,7 +3527,7 @@@@
d688 1
a688 1
@@@@ -3534,7 +3537,7 @@@@
d697 1
a697 1
@@@@ -3543,7 +3546,7 @@@@
d706 1
a706 1
@@@@ -3551,14 +3554,14 @@@@
d725 1
a725 1
@@@@ -3572,7 +3575,7 @@@@
d734 1
a734 1
@@@@ -3582,7 +3585,7 @@@@
d743 1
a743 1
@@@@ -3602,7 +3605,7 @@@@
d752 1
a752 1
@@@@ -3624,7 +3627,7 @@@@
d761 1
a761 1
@@@@ -3643,7 +3646,7 @@@@
d770 1
a770 1
@@@@ -3664,7 +3667,7 @@@@
d779 1
a779 1
@@@@ -3679,7 +3682,7 @@@@
d788 1
a788 1
@@@@ -3732,7 +3735,7 @@@@
d797 1
a797 1
@@@@ -3748,15 +3751,15 @@@@
d816 1
a816 1
@@@@ -3795,13 +3798,13 @@@@
d832 1
a832 1
@@@@ -3861,7 +3864,7 @@@@
d841 1
a841 1
@@@@ -3914,10 +3917,10 @@@@
d852 1
d854 1
a854 2
 		continue;
@@@@ -3965,7 +3968,7 @@@@
d863 1
a863 1
@@@@ -3987,7 +3990,7 @@@@
d869 1
a869 1
 				      (char *) flp->text.data);
d872 1
a872 1
@@@@ -4011,13 +4014,13 @@@@
d888 2
a889 2
 	    mail_free_stringlist(&folders);
@@@@ -4026,7 +4029,7 @@@@
d898 1
a898 1
@@@@ -4040,7 +4043,7 @@@@
d907 1
a907 1
@@@@ -4080,19 +4083,19 @@@@
d930 1
a930 1
@@@@ -4108,11 +4111,11 @@@@
d945 1
a945 1
@@@@ -4133,7 +4136,7 @@@@
d954 1
a954 1
@@@@ -4143,7 +4146,7 @@@@
d963 1
a963 1
@@@@ -4153,13 +4156,13 @@@@
d979 1
a979 1
@@@@ -4182,7 +4185,7 @@@@
d988 1
a988 1
@@@@ -4264,7 +4267,7 @@@@
d997 1
a997 1
@@@@ -4275,7 +4278,7 @@@@
d1006 1
a1006 1
@@@@ -4283,7 +4286,7 @@@@
d1015 8
a1022 2
@@@@ -4332,7 +4335,7 @@@@
     int         ret, close_opened = 0, blast_folder = 1;
d1030 1
a1030 1
@@@@ -4354,7 +4357,7 @@@@
d1039 1
a1039 10
@@@@ -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);
     }
 
@@@@ -4382,12 +4385,12 @@@@
d1054 1
a1054 1
@@@@ -4402,7 +4405,7 @@@@
d1063 1
a1063 1
@@@@ -4413,19 +4416,19 @@@@
d1088 1
a1088 1
@@@@ -4434,7 +4437,7 @@@@
d1097 1
a1097 1
@@@@ -4442,13 +4445,13 @@@@
d1116 1
a1116 1
@@@@ -4491,13 +4494,13 @@@@
d1133 1
a1133 1
@@@@ -4642,7 +4645,7 @@@@
d1142 1
a1142 1
@@@@ -4658,7 +4661,7 @@@@
d1151 1
a1151 1
@@@@ -4734,7 +4737,7 @@@@
d1160 1
a1160 1
@@@@ -4767,7 +4770,7 @@@@
d1169 1
a1169 1
@@@@ -4910,7 +4913,7 @@@@
d1178 1
a1178 1
@@@@ -4932,7 +4935,7 @@@@
d1187 1
a1187 1
@@@@ -4941,7 +4944,7 @@@@
d1196 1
a1196 1
@@@@ -5102,7 +5105,7 @@@@
d1205 1
a1205 1
@@@@ -5147,14 +5150,14 @@@@
d1223 1
a1223 1
@@@@ -5162,7 +5165,7 @@@@
d1232 1
a1232 1
@@@@ -5173,7 +5176,7 @@@@
d1241 1
a1241 1
@@@@ -5184,7 +5187,7 @@@@
d1250 1
a1250 1
@@@@ -5241,9 +5244,9 @@@@
d1263 1
a1263 1
@@@@ -5257,14 +5260,14 @@@@
d1280 1
a1280 1
@@@@ -6273,7 +6276,7 @@@@
d1289 1
a1289 1
@@@@ -6314,14 +6317,14 @@@@
d1308 1
a1308 1
@@@@ -7503,7 +7506,7 @@@@
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 268
a268 4
--- pine/init.c.orig	Fri Jul 17 02:22:22 1998
+++ pine/init.c	Tue Jul 28 08:35:02 1998
@@@@ -579,6 +579,9 @@@@
     GLO_SMTP_SERVER		= parse_list(DF_SMTP_SERVER, 1, NULL);
d270 1023
d1294 26
a1319 6
+    F_TURN_ON(F_TCAP_WINS,ps);
+    F_TURN_ON(F_QUELL_INTERNAL_MSG,ps);
+
     /* Set the default mail directory */
     build_path(buf, GLO_MAIL_DIRECTORY, "[]");
     GLO_FOLDER_SPEC		= parse_list(buf, 1, NULL);
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 5
a5 21
--- pine/newmail.c.orig	Fri Mar 27 07:28:33 1998
+++ pine/newmail.c	Wed Jul 15 17:02:35 1998
@@@@ -289,38 +289,28 @@@@
     ENVELOPE	*e;
     char	 subject[200], from[2*MAX_SCREEN_COLS],
 		 intro[MAX_SCREEN_COLS+1];
-    static char *carray[] = { "regarding",
-				"concerning",
-				"about",
-				"as to",
-				"as regards",
-				"as respects",
-				"in re",
-				"re",
-				"respecting",
-				"in point of",
-				"with regard to",
-				"subject:"
+    static char *carray[] = { "",
+				""
     };
d7 6
a12 43
     e = mail_fetchstructure(stream, max_num, NULL);
 
     if(!folder) {
         if(number > 1)
-          sprintf(intro, "%ld new messages!", number);
+          sprintf(intro, "%ld ʷsHI", number);
         else
-	  sprintf(intro, "New mail%s!",
-		  (e && address_is_us(e->to, ps_global)) ? " to you" : "");
+	  sprintf(intro, "%ssHI",
+		  (e && address_is_us(e->to, ps_global)) ? "z" : "");
     }
     else {
         if(number > 1)
-          sprintf(intro,"%ld messages saved to folder \"%s\"", number, folder);
+          sprintf(intro,"%ld ʫHQsܸƧX \"%s\"", number, folder);
         else
-          sprintf(intro, "Mail saved to folder \"%s\"", folder);
+          sprintf(intro, "HQsܸƧX \"%s\"", folder);
     }
 
     if(e && e->from){
-	sprintf(from, " %srom ", (number > 1L) ? "Most recent f" : "F");
+	sprintf(from, "%s", (number > 1L) ? "̪" : "");
 	if(e->from->personal)
 	  istrncpy(from + ((number > 1L) ? 18 : 6),
 		   (char *) rfc1522_decode((unsigned char *) tmp_20k_buf,
@@@@ -337,13 +327,13 @@@@
 
     if(number <= 1L) {
         if(e && e->subject){
-	    sprintf(subject, " %s ", carray[(unsigned)random()%12]);
+	    sprintf(subject, " %s ", carray[(unsigned)random()%2]);
 	    istrncpy(subject + strlen(subject),
 		     (char *) rfc1522_decode((unsigned char *) tmp_20k_buf,
 					     e->subject, NULL), 100);
 	}
 	else
-	  strcpy(subject, " with no subject");
+	  strcpy(subject, " SDD");
 
         if(!from[0])
           subject[1] = toupper((unsigned char)subject[1]);
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@d1 21
a21 4
--- pico/search.c.orig	Sat Jan 17 20:23:39 1998
+++ pico/search.c	Sat Jan 17 20:24:28 1998
@@@@ -222,11 +222,11 @@@@
 	EXTRAKEYS    menu_pat[3];
d23 43
a65 11
 	menu_pat[0].name  = "^Y";
-	menu_pat[0].label = "FirstLine";
+	menu_pat[0].label = "Ĥ@@";
 	menu_pat[0].key   = (CTRL|'Y');
 	KS_OSDATASET(&menu_pat[0], KS_NONE);
 	menu_pat[1].name  = "^V";
-	menu_pat[1].label = "LastLine";
+	menu_pat[1].label = "̫@@";
 	menu_pat[1].key   = (CTRL|'V');
 	KS_OSDATASET(&menu_pat[1], KS_NONE);
 	menu_pat[2].name  = NULL;
@
