Index: mnews-1.22-qnx/build/config.sh
diff -u mnews-1.22-qnx/build/config.sh:1.1.1.1 mnews-1.22-qnx/build/config.sh:1.1.4.1
--- mnews-1.22-qnx/build/config.sh:1.1.1.1	Wed Nov 27 10:12:16 2002
+++ mnews-1.22-qnx/build/config.sh	Tue Dec  3 09:54:54 2002
@@ -803,6 +803,7 @@
 	echo "-DINET6             support IPv6 with RFC2553 system."
 	echo "-DLARGE             support extend commands."
 	echo "-DLOCAL_POST        always post by inews."
+	echo "-DLOCK_LANGUAGE     disable language switching by the 'x' key."
 	echo "-DMOUSE             support mouse operation with xterm/kterm."
 	echo "-DNNTP_AUTH         support INN authority function."
 	echo "-DRECOVER_SUBJECT   recover subject without ESC code."
Index: mnews-1.22-qnx/src/article.c
diff -u mnews-1.22-qnx/src/article.c:1.1.1.1 mnews-1.22-qnx/src/article.c:1.1.2.3
--- mnews-1.22-qnx/src/article.c:1.1.1.1	Wed Nov 27 10:12:20 2002
+++ mnews-1.22-qnx/src/article.c	Fri Dec 13 08:28:49 2002
@@ -245,16 +245,15 @@
   "\tP            read previous article.",
   "\tN            read next article.",
   "\t*            read Message-ID article.",
-  "\t^            read referece article.",
+  "\t^            read reference article.",
   "\n  [MOVE]",
   "\tk or ^P      previous article.",
   "\tj or ^N      next article.",
-  "\t^U or ^B     previous page article.",
-  "\t^D, ^F or ^V next page article.",
+  "\t^U or ^B     previous page.",
+  "\t^D, ^F or ^V next page.",
   "\t<            top article.",
   "\t>            last article.",
-  "\tTAB          jump to specified article.",
-  "\t             (Please input article number.)",
+  "\tTAB          jump to article by article number.",
   "\to, q or return",
   "\t             exit from article select mode.",
   "\n  [MARK]",
@@ -264,29 +263,29 @@
   "\tu or z       clear read mark and move to next.",
   "\tM            toggle multi mark and move to next.",
   "\tK            mark as read same subject articles.",
-  "\tc            mark as read all articles.",
-  "\t             (Please make sure y/n.)",
+  "\tc            mark all articles as read.",
+  "\t             (confirm with y/n)",
 #ifdef	LARGE
-  "\t+            mark as read all forward articles.",
-  "\t             (Please make sure y/n.)",
-  "\t-            mark as read all backward articles.",
-  "\t             (Please make sure y/n.)",
+  "\t+            mark all following articles as read."
+  "\t             (confirm with y/n)",
+  "\t-            mark all previous articles as read."
+  "\t             (confirm with y/n)",
   "\t$            mark same subject as read for all groups.",
   "\t%            mark same author as read for all groups.",
 #endif	/* LARGE */
 #ifdef	NEWSPOST
   "\n  [POST]",
   "\ta            post new article.",
-  "\tf            follow.",
-  "\tF            follow with original article.",
+  "\tf            post followup.",
+  "\tF            post follow with quoting."
   "\tC            cancel article.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
 #endif	/* NEWSPOST */
 #ifdef	MAILSEND
   "\n  [SEND]",
   "\tm            mail.",
   "\tr            reply.",
-  "\tR            reply with original article.",
+  "\tR            reply with quoting."
   "\t=            forward.",
 #ifdef	LARGE
   "\t~            relay.",
@@ -294,11 +293,11 @@
 #endif	/* MAILSEND */
   "\n  [SAVE]",
   "\ts            save article.",
-  "\t             (Please input file name.If file exists, please select",
+  "\t             (enter file name. If file already exists, select",
   "\t              y:append n:abort or o:overwrite.)",
 #ifdef	MH
   "\tO            save article in MH folder.",
-  "\t             (Please Input MH folder name.)",
+  "\t             (enter MH folder name.)",
 #endif	/* MH */
   "\n  [DISPLAY]",
   "\tl            toggle print read/cancel article.",
@@ -307,7 +306,7 @@
   "\tT            change sort rule.",
 #endif	/* REF_SORT */
   "\001",
-  "\tG            print news group description.",
+  "\tG            show news group description.",
   "\tg            reconnect to news server.",
 #endif	/* !SMALL */
   (char*)NULL,
@@ -443,7 +442,7 @@
     if (i >= 0) {
       print_mode_line(japanese ?
 		      "未読記事がないため、未読グループ(%s)を参照します。" :
-		      "Because unread article not found,Read unread group(%s).",
+		      "Because unread article wasn't found, Read unread group(%s).",
 		      news_group[i].group_name);
       news_count_unread(current_group);
       strcpy(jump_name, news_group[i].group_name);
@@ -816,7 +815,7 @@
 	  case 'c':		/* 全記事マーク		*/
 	    if (yes_or_no(NORMAL_YN_MODE,
 			  "全記事をマークしてよろしいですか?",
-			  "Mark all articles.Are you sure?")) {
+			  "Mark all articles. Are you sure?")) {
 	      for (i = 0; i < news_article_number; i++) {
 		article_list[i].mark |= READ_MARK;
 	      }
@@ -1004,7 +1003,7 @@
 	  case '+':		/* 前方記事全マーク	*/
 	    if (yes_or_no(NORMAL_YN_MODE,
 			  "前方の全記事をマークしてよろしいですか?",
-			  "Mark all forward articles.Are you sure?")) {
+			  "Mark all following articles. Are you sure?")) {
 	      for (i = current_article; i < news_article_number; i++) {
 		article_list[i].mark |= READ_MARK;
 		news_add_mark(current_group,
@@ -1017,7 +1016,7 @@
 	  case '-':		/* 後方記事全マーク	*/
 	    if (yes_or_no(NORMAL_YN_MODE,
 			  "後方の全記事をマークしてよろしいですか?",
-			  "Mark all backward articles.Are you sure?")) {
+			  "Mark all previous articles. Are you sure?")) {
 	      for (i = 0; i <= current_article; i++) {
 		article_list[i].mark |= READ_MARK;
 		news_add_mark(current_group,
@@ -1870,7 +1869,7 @@
 	  return(1);
 	}
 	if (found) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *current_ptr = current_article;
 	  term_disable_abort();
 	  return(0);
@@ -1888,7 +1887,7 @@
 	  return(1);
 	}
 	if (found) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *current_ptr = current_article;
 	  term_disable_abort();
 	  return(0);
@@ -2049,7 +2048,7 @@
 	  return(1);
 	}
 	if (found) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *current_ptr = current_article;
 	  term_disable_abort();
 	  return(0);
@@ -2067,7 +2066,7 @@
 	  return(1);
 	}
 	if (found) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *current_ptr = current_article;
 	  term_disable_abort();
 	  return(0);
@@ -2612,7 +2611,7 @@
   if (!stat(file_name, &stat_buff)) {
     switch (yes_or_no(FILE_YN_MODE,
 		      "ファイルが存在します。アペンドしますか?",
-		      "File exists.Append?")) {
+		      "File exists. Append?")) {
     case 2:
       unlink(file_name);
       break;
@@ -3402,7 +3401,7 @@
     print_title();
     input_line(INPUT_SPCCUT_MASK | INPUT_SPCRET_MASK,
 	       "ソートする記事数を入力して下さい:",
-	       "Input how many articles sort:", buff);
+	       "Input number of articles to sort:", buff);
     if (buff[0]) {
       i = atoi(buff);
       if (i <= 0) {
@@ -3424,7 +3423,7 @@
    */
 
 #ifdef	USE_SORT_ABORT
-  print_mode_line(japanese ? "ソート中です。(^C:中断)" : "Sorting.(^C:abort)");
+  print_mode_line(japanese ? "ソート中です。(^C:中断)" : "Sorting. (^C:abort)");
   term_enable_abort();
 #else	/* !USE_SORT_ABORT */
   print_mode_line(japanese ? "ソート中です。" : "Sorting.");
Index: mnews-1.22-qnx/src/board.c
diff -u mnews-1.22-qnx/src/board.c:1.1.1.1 mnews-1.22-qnx/src/board.c:1.1.2.2
--- mnews-1.22-qnx/src/board.c:1.1.1.1	Wed Nov 27 10:12:20 2002
+++ mnews-1.22-qnx/src/board.c	Fri Dec 13 08:28:49 2002
@@ -290,14 +290,14 @@
   "\t<            top group.",
   "\t>            last group.",
   "\tTAB          jump to specified board category or group.",
-  "\t             (Please input board category or group name.)",
+  "\t             (enter board category or group name.)",
   "\to, q or RETURN",
   "\t             exit group.",
   "\n  [MARK]",
   "\tU            toggle subscribe mark and move to previous.",
   "\tu            toggle subscribe mark and move to next.",
   "\tc            mark as read all articles in category/group.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
 #ifdef	MAILSEND
   "\n  [POST]",
   "\ta            send new article.",
@@ -306,9 +306,9 @@
 #endif	/* MAILSEND */
   "\n  [SEARCH]",
   "\t/            forward search pattern.",
-  "\t             (Please input search pattern.)",
+  "\t             (enter search pattern.)",
   "\t\\            backward search pattern.",
-  "\t             (Please input search pattern.)",
+  "\t             (enter search pattern.)",
   "\n  [DISPLAY]",
   "\tL or l       toggle print read group.",
   "\tG            toggle news/board group print mode.",
@@ -339,7 +339,7 @@
   "\t<            top article.",
   "\t>            last article.",
   "\tTAB          jump to specified article.",
-  "\t             (Please input article number.)",
+  "\t             (enter article number.)",
   "\to, q or return",
   "\t             exit group.",
   "\n  [MARK]",
@@ -348,26 +348,26 @@
   "\tU or Z       clear read mark and move to previous.",
   "\tu or z       clear read mark and move to next.",
   "\tM            toggle multi mark and move to next.",
-  "\tK            mark as read same subject article.",
-  "\tc            mark as read all articles.",
-  "\t             (Please make sure y/n.)",
+  "\tK            mark all articles with same subject as read."
+  "\tc            mark all articles as read."
+  "\t             (confirm with y/n)",
 #ifdef	LARGE
-  "\t+            mark as read all forward articles.",
-  "\t             (Please make sure y/n.)",
-  "\t-            mark as read all backward articles.",
-  "\t             (Please make sure y/n.)",
+  "\t+            mark all following articles as read"
+  "\t             (confirm with y/n)",
+  "\t-            mark all previous articles as read"
+  "\t             (confirm with y/n)",
 #endif	/* LARGE */
 #ifdef	MAILSEND
   "\n  [POST]",
   "\ta            send new article.",
-  "\tf            follow.",
-  "\tF            follow with original article.",
+  "\tf            followup.",
+  "\tF            follow with quoting."
   "\tC            cancel article.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
   "\n  [SEND]",
   "\tm            mail.",
   "\tr            reply.",
-  "\tR            reply with original article.",
+  "\tR            reply with quoting."
   "\t=            forward.",
 #ifdef	LARGE
   "\t~            relay.",
@@ -375,11 +375,11 @@
 #endif	/* MAILSEND */
   "\n  [SAVE]",
   "\ts            save article.",
-  "\t             (Please input file name.If file exists, please select",
+  "\t             (Enter file name. If file exists, select",
   "\t              y:append n:abort or o:overwrite.)",
 #ifdef	MH
   "\tO            save article in MH folder.",
-  "\t             (Please Input MH folder name.)",
+  "\t             (Enter MH folder name.)",
 #endif	/* MH */
   "\n  [DISPLAY]",
   "\tl            toggle print read/cancel article.",
@@ -875,7 +875,7 @@
 	case 'c':		/* グループ全マーク	*/
 	  if (yes_or_no(NORMAL_YN_MODE,
 			"本カテゴリ/グループを全てマークしてよろしいですか?",
-			"Mark all articles in this news category/group.Are you sure?")) {
+			"Mark all articles in this news category/group. Are you sure?")) {
 	    board_selected_group[current_group].unread_article = 0;
 	    if (board_selected_group[current_group].max_article < 0) {
 	      j = strlen(board_selected_group[current_group].group_name);
@@ -1306,7 +1306,7 @@
 	  case 'c':		/* 全記事マーク		*/
 	    if (yes_or_no(NORMAL_YN_MODE,
 			  "全記事をマークしてよろしいですか?",
-			  "Mark all articles.Are you sure?")) {
+			  "Mark all articles. Are you sure?")) {
 	      for (i = 0; i < board_article_number; i++) {
 		article_list[i].mark |= READ_MARK;
 	      }
@@ -1466,7 +1466,7 @@
 	  case '+':		/* 前方記事全マーク	*/
 	    if (yes_or_no(NORMAL_YN_MODE,
 			  "前方の全記事をマークしてよろしいですか?",
-			  "Mark all forward articles.Are you sure?")) {
+			  "Mark all following articles. Are you sure?")) {
 	      for (i = current_article; i < board_article_number; i++) {
 		article_list[i].mark |= READ_MARK;
 		board_add_mark(current_group,
@@ -1479,7 +1479,7 @@
 	  case '-':		/* 後方記事全マーク	*/
 	    if (yes_or_no(NORMAL_YN_MODE,
 			  "後方の全記事をマークしてよろしいですか?",
-			  "Mark all backward articles.Are you sure?")) {
+			  "Mark all previous articles. Are you sure?")) {
 	      for (i = 0; i <= current_article; i++) {
 		article_list[i].mark |= READ_MARK;
 		board_add_mark(current_group,
@@ -2865,7 +2865,7 @@
     sprintf(buff, "%s@%s", user_name, domain_name);
     if (strindex(from_buff, buff)) {
       if (yes_or_no(CARE_YN_MODE, "記事をキャンセルしてよろしいですか?",
-		    "Cancel article.Are you sure?")) {
+		    "Cancel article. Are you sure?")) {
 	return(unlink(cancel_file));
       }
     }
@@ -3106,7 +3106,7 @@
       for (current_group = *group_ptr - 1; current_group >= 0;
 	   current_group--) {
 	if (strindex(board_selected_group[current_group].group_name, str)) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *group_ptr = current_group;
 	  return(0);
 	}
@@ -3115,7 +3115,7 @@
       for (current_group = *group_ptr + 1; current_group < max_group;
 	   current_group++) {
 	if (strindex(board_selected_group[current_group].group_name, str)) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *group_ptr = current_group;
 	  return(0);
 	}
Index: mnews-1.22-qnx/src/group.c
diff -u mnews-1.22-qnx/src/group.c:1.1.1.1 mnews-1.22-qnx/src/group.c:1.1.2.2
--- mnews-1.22-qnx/src/group.c:1.1.1.1	Wed Nov 27 10:12:21 2002
+++ mnews-1.22-qnx/src/group.c	Fri Dec 13 08:28:50 2002
@@ -200,20 +200,19 @@
   "\t<            top category/group.",
   "\t>            last category/group.",
   "\tTAB          jump to specified news category/group.",
-  "\t             (Please input news category/group name.)",
+  "\t             (enter news category/group name.)",
   "\tq            exit category/group.",
-  "\t             (When top category then exit.)",
+  "\t             In top category, then exit.",
   "\to or RETURN  exit category/group.",
-  "\t             (When top category then ignore.)",
   "\n  [MARK]",
   "\tU            toggle subscribe mark and move to previous.",
   "\tu            toggle subscribe mark and move to next.",
-  "\tc            mark as read all articles in category/group.",
-  "\t             (Please make sure y/n.)",
+  "\tc            mark all articles in category/group as read.",
+  "\t             (confirm with y/n)",
   "\tT            toggle transpose mark and move to previous.",
   "\tt            toggle transpose mark and move to next.",
   "\t#            move transpose marked category/group.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
 #ifdef	NEWSPOST
   "\n  [POST]",
   "\ta            post new article.",
@@ -224,20 +223,20 @@
 #endif	/* MAILSEND */
   "\n  [SEARCH]",
   "\t/            forward search pattern.",
-  "\t             (Please input search pattern.)",
+  "\t             (enter search pattern.)",
   "\t\\            backward search pattern.",
-  "\t             (Please input search pattern.)",
+  "\t             (enter search pattern.)",
   "\n  [DISPLAY]",
   "\tL or l       toggle print read group.",
   "\tG            toggle news/board group print mode.",
-  "\t             (When top category only)",
+  "\t             (at top category only)",
   "\001",
   "\tg            check new news again.",
   "\tB            delete bogus newsgroup.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
   "\tW            save mark-file.",
   "\tX            force quit system without save mark-file.",
-  "\t             (When top category only)",
+  "\t             (at top category only)",
 #ifdef	notdef
   "\t*            send user name and password to news-server.",
 #endif	/* notdef */
@@ -592,7 +591,7 @@
     case 'X':		/* 強制終了		*/
       if (!select_name[0]) {
 	if (yes_or_no(CARE_YN_MODE, "強制終了してよろしいですか?",
-		      "Force exit system.Are you sure?")) {
+		      "Force exit system. Are you sure?")) {
 	  return(-1);
 	}
 	top_position = -1;
@@ -685,7 +684,7 @@
 	  if (gnus_mode) {
 	    if (yes_or_no(NORMAL_YN_MODE,
 			  "置換マークされたカテゴリ/グループを移動してよろしいですか?",
-			  "Move transpose marked category/group.Are you sure?")) {
+			  "Move transpose marked category/group. Are you sure?")) {
 	      if (!news_transpose_group(current_group, level)) {
 		strcpy(buff1, news_get_name(current_group, level));
 		news_match_group(select_name);
@@ -765,7 +764,7 @@
 		news_prev_level(select_name, buff3);
 		strcpy(select_name, buff3);
 		if (strcmp(select_name, buff2)) {
-		  print_fatal("Previous group mismatch.\"%s\",\"%s\"",
+		  print_fatal("Previous group mismatch. \"%s\",\"%s\"",
 			      select_name, buff2);
 		  strcpy(select_name, buff2);
 		}
@@ -807,7 +806,7 @@
 		top_position = -1;
 		if (!yes_or_no(NORMAL_YN_MODE,
 			       "本カテゴリの購読モードを切替てよろしいですか?",
-			       "Toggle subscribe mode in this news category.Are you sure?")) {
+			       "Toggle subscribe mode in this news category. Are you sure?")) {
 		  status = 0;
 		  break;
 		}
@@ -850,7 +849,7 @@
 	    case 'c':		/* グループ全マーク	*/
 	      if (yes_or_no(NORMAL_YN_MODE,
 			    "本カテゴリ/グループを全てマークしてよろしいですか?",
-			    "Mark all articles in this news category/group.Are you sure?")) {
+			    "Mark all articles in this news category/group. Are you sure?")) {
 		news_selected_group[current_group].unread_article = 0;
 		strcpy(buff1, news_get_name(current_group, level));
 		if (news_selected_group[current_group].max_article < 0L) {
@@ -1671,7 +1670,7 @@
 	   current_group--) {
 	strcpy(buff, news_get_name(current_group, level));
 	if (strindex(buff, str)) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *group_ptr = current_group;
 	  return(0);
 	}
@@ -1681,7 +1680,7 @@
 	   current_group++) {
 	strcpy(buff, news_get_name(current_group, level));
 	if (strindex(buff, str)) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *group_ptr = current_group;
 	  return(0);
 	}
Index: mnews-1.22-qnx/src/mailsend.c
diff -u mnews-1.22-qnx/src/mailsend.c:1.1.1.1 mnews-1.22-qnx/src/mailsend.c:1.1.2.3
--- mnews-1.22-qnx/src/mailsend.c:1.1.1.1	Wed Nov 27 10:12:21 2002
+++ mnews-1.22-qnx/src/mailsend.c	Fri Dec 13 08:28:50 2002
@@ -91,13 +91,13 @@
 
 #ifdef	SEND_CONFIRM
   if (!yes_or_no(NORMAL_YN_MODE, "新しい記事を発信しますか?",
-		 "Send new article.Are you sure?")) {
+		 "Compose a new mail?")) {
     return(1);
   }
 #endif	/* SEND_CONFIRM */
   strcpy(to_buff, adrs);
   input_line(0, "主宛先(to)を入力して下さい:",
-	     "Input recipient(to) address:", to_buff);
+	     "Input recipient(To:) address:", to_buff);
   if (!to_buff[0]) {
     return(1);
   }
@@ -107,7 +107,7 @@
     cc_buff[0] = '\0';
   }
   input_line(0, "コピー宛先(cc)を入力して下さい:",
-	     "Input carbon copy(cc) address:", cc_buff);
+	     "Input carbon copy(CC:) address:", cc_buff);
   subject_buff[0] = '\0';
   input_line(0, "題名(subject)を入力して下さい:",
 	     "Input subject:", subject_buff);
@@ -223,7 +223,7 @@
 
 #ifdef	SEND_CONFIRM
   if (!yes_or_no(NORMAL_YN_MODE, "記事を返信しますか?",
-		 "Send reply article.Are you sure?")) {
+		 "Compose a reply article?")) {
     return(1);
   }
 #endif	/* SEND_CONFIRM */
@@ -525,7 +525,7 @@
 	}
       }
       ptr1 = (japanese ? "%Iの記事において\n%F{さん,私}は書きました。\n" :
-	      "In article %I\n%F writes:\n");
+	      "%F wrote in article %I:\n");
 #ifdef	SJIS_SRC
       sjis_to_euc(buff1, ptr1);
       ptr1 = buff1;
@@ -622,18 +622,18 @@
 
 #ifdef	SEND_CONFIRM
   if (!yes_or_no(NORMAL_YN_MODE, "記事を転送しますか?",
-		 "Forward article.Are you sure?")) {
+		 "Forward the article?")) {
     return(1);
   }
 #endif	/* SEND_CONFIRM */
   to_buff[0] = cc_buff[0] = '\0';
   input_line(0, "主宛先(to)を入力して下さい:",
-	     "Input recipient(to) address:", to_buff);
+	     "Input recipient(To:) address:", to_buff);
   if (!to_buff[0]) {
     return(1);
   }
   input_line(0, "コピー宛先(cc)を入力して下さい:",
-	     "Input carbon copy(cc) address:", cc_buff);
+	     "Input carbon copy(CC:) address:", cc_buff);
   print_mode_line(japanese ? "変換中です。" : "Converting.");
   create_temp_name(forward_file, "TD");
   convert_code(base_file, forward_file, EUC_CODE, 4);
@@ -815,18 +815,18 @@
 
 #ifdef	SEND_CONFIRM
   if (!yes_or_no(NORMAL_YN_MODE, "記事を回送しますか?",
-		 "Relay article.Are you sure?")) {
+		 "Relay the article?")) {
     return(1);
   }
 #endif	/* SEND_CONFIRM */
   to_buff2[0] = cc_buff2[0] = '\0';
   input_line(0, "主宛先(to)を入力して下さい:",
-	     "Input recipient(to) address:", to_buff2);
+	     "Input recipient(To:) address:", to_buff2);
   if (!to_buff2[0]) {
     return(1);
   }
   input_line(0, "コピー宛先(cc)を入力して下さい:",
-	     "Input carbon copy(cc) address:", cc_buff2);
+	     "Input carbon copy(CC:) address:", cc_buff2);
   print_mode_line(japanese ? "変換中です。" : "Converting.");
   create_temp_name(relay_file, "LD");
   convert_code(base_file, relay_file, EUC_CODE, 4);
@@ -1470,7 +1470,7 @@
     term_bell();
     switch (yes_or_no(IGNORE_YN_MODE,
 		      "記事が大き過ぎます。再編集しますか?",
-		      "Too large article. Edit again?")) {
+		      "Article too large. Edit again?")) {
     case 0:
       funlink2(tmp_file1);
       return(-1);
@@ -1508,7 +1508,7 @@
   if (char_mask & (KANA_MASK | HOJO_MASK)) {
     print_mode_line(japanese ?
 		    "警告 : 通常許されていない文字が含まれています。" :
-		    "Warning : Normally, unallowed character included.");
+		    "Warning : unallowed character seen.");
     term_bell();
     sleep(ERROR_SLEEP);
   }
@@ -1519,7 +1519,7 @@
    */
 
   switch (yes_or_no(SEND_YN_MODE, "記事を送信してよろしいですか?",
-		    "Send article.Are you sure?")) {
+		    "Send the article?")) {
   case 1:
     break;
   case 2:
@@ -1632,7 +1632,7 @@
   if (fp != (FILE*)NULL) {
     if (!auto_sig_mode) {
       if (!yes_or_no(NORMAL_YN_MODE, "signature%s ファイルをつけますか?",
-		     "Add signature%s file.Are you sure?", ptr2)) {
+		     "Add signature%s file. Confirm", ptr2)) {
 	fclose(fp);
 	fp = (FILE*)NULL;
       }
Index: mnews-1.22-qnx/src/mark.c
diff -u mnews-1.22-qnx/src/mark.c:1.1.1.1 mnews-1.22-qnx/src/mark.c:1.1.2.1
--- mnews-1.22-qnx/src/mark.c:1.1.1.1	Wed Nov 27 10:12:21 2002
+++ mnews-1.22-qnx/src/mark.c	Fri Nov 29 15:55:46 2002
@@ -519,7 +519,7 @@
   if (number) {
     if (yes_or_no(CARE_YN_MODE,
 		  "%d個の無効なニュースグループを削除してよろしいですか?",
-		  "Delete %d bogus newsgroup(s).Are you sure?", number)) {
+		  "Delete %d bogus newsgroup(s). Are you sure?", number)) {
       mark_lock++;
       bogus_ptr = bogus_list;
       while (bogus_ptr != (BOGUS_LIST*)NULL) {
@@ -587,7 +587,7 @@
   bogus_ptr = bogus_list;
   for (order = 0; rest > 0; order++) {
     if (order > max_line) {
-      print_fatal("Program error.unexpected order group exists.");
+      print_fatal("Program error. unexpected order group exists.");
       break;
     }
     while (bogus_ptr != (BOGUS_LIST*)NULL) {
@@ -907,7 +907,7 @@
     } else if ((mark_ptr->start_number < start_number) &&
 	       (mark_ptr->end_number > end_number)) {
       if (alloc_flag) {
-	print_fatal("Program error-1.unexpected article list found.");
+	print_fatal("Program error-1. unexpected article list found.");
 	break;
       }
       alloc_flag = 1;
@@ -924,7 +924,7 @@
       mark_ptr->next_ptr      = alloc_ptr;
       if ((mark_ptr->start_number > mark_ptr->end_number) ||
 	  (alloc_ptr->start_number > alloc_ptr->end_number)) {
-	print_fatal("Program error-2.unexpected article list found.");
+	print_fatal("Program error-2. unexpected article list found.");
 	break;
       }
       continue;
@@ -937,7 +937,7 @@
       mark_ptr->end_number = start_number - 1;
       continue;
     } else {
-      print_fatal("Program error-3.unexpected article list found.");
+      print_fatal("Program error-3. unexpected article list found.");
       break;
     }
 
Index: mnews-1.22-qnx/src/mh.c
diff -u mnews-1.22-qnx/src/mh.c:1.1.1.1 mnews-1.22-qnx/src/mh.c:1.1.2.4
--- mnews-1.22-qnx/src/mh.c:1.1.1.1	Wed Nov 27 10:12:21 2002
+++ mnews-1.22-qnx/src/mh.c	Tue Dec 17 02:17:07 2002
@@ -362,7 +362,7 @@
   "\t<            top folder.",
   "\t>            last folder.",
   "\tTAB          jump to specified category/folder.",
-  "\t             (Please input category/folder name.)",
+  "\t             (enter category/folder name.)",
 #ifdef	LARGE
   "\tI            jump to new article folder.",
 #endif	/* LARGE */
@@ -374,17 +374,17 @@
 #endif	/* MAILSEND */
   "\n  [SEARCH]",
   "\t/            forward search pattern.",
-  "\t             (Please input search pattern.)",
+  "\t             (enter search pattern.)",
   "\t\\            backward search pattern.",
-  "\t             (Please input search pattern.)",
+  "\t             (enter search pattern.)",
   "\n  [DISPLAY]",
   "\tG            toggle news(board) group/folder print mode.",
-  "\t             (When top folder only)",
+  "\t             (at top folder only)",
   "\001",
   "\tC            create new folder.",
-  "\t             (Please input folder name.)",
+  "\t             (enter folder name.)",
   "\tDEL or BS    delete folder.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
 #endif	/* !SMALL */
   (char*)NULL,
 };
@@ -407,21 +407,21 @@
   "\n  [MOVE]",
   "\tk or ^P      previous article.",
   "\tj or ^N      next article.",
-  "\t^U or ^B     previous page article.",
-  "\t^D, ^F or ^V next page article.",
+  "\t^U or ^B     previous page.",
+  "\t^D, ^F or ^V next page.",
   "\t<            top article.",
   "\t>            last article.",
   "\tTAB          jump to specified article.",
-  "\t             (Please input article number.)",
+  "\t             (enter article number.)",
 #ifdef	LARGE
-  "\t{            previous delete mark article.",
-  "\t}            next delete mark article.",
+  "\t{            previous delete marked article.",
+  "\t}            next delete marked article.",
 #endif	/* LARGE */
   "\to, q or return",
   "\t             exit from article select mode.",
   "\n  [MARK]",
-  "\tD            mark as delete and move to previous.",
-  "\td            mark as delete and move to next.",
+  "\tD            mark as deleted and move to previous.",
+  "\td            mark as deleted and move to next.",
   "\tU            clear delete mark and move to previous.",
   "\tu            clear delete mark and move to next.",
   "\tY            mark as read and move to previous.",
@@ -431,14 +431,14 @@
   "\tM            toggle multi mark and move to next.",
   "\tC            clear all saved mark and move to next.",
   "\tc            mark all articles.",
-  "\t             (Please select y:read n:abort or d:delete mark.)",
+  "\t             (confirm with y:read n:abort or d:delete mark.)",
   "\t$            pick articles and mark as delete.",
-  "\t             (Please input pick pattern.)",
+  "\t             (enter pick pattern.)",
 #ifdef	MAILSEND
   "\n  [SEND]",
   "\tm            mail.",
   "\tr            reply.",
-  "\tR            reply with original article.",
+  "\tR            reply with quoting."
   "\t= or f       forward.",
 #ifdef	LARGE
   "\t~            relay.",
@@ -446,25 +446,25 @@
 #endif	/* MAILSEND */
   "\n  [SAVE]",
   "\ts            save article.",
-  "\t             (Please input file name.If file exists, please select",
+  "\t             (enter file name. If file exists, select",
   "\t              y:append n:abort or o:overwrite.)",
   "\n  [INCLUDE]",
   "\tI            include new mail.",
   "\tL            include UCB-mail or pack format article file.",
-  "\t             (Please input file name.)",
+  "\t             (enter file name.)",
   "\n  [DELETE/REORDER]",
   "\tDEL or BS    remove delete marked article.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
   "\t^            refile delete marked article.",
-  "\t             (Please input folder name.)",
+  "\t             (confirm with y/n)",
   "\t#            pack articles.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
   "\t%            sort article by date.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
 #ifdef	LARGE
 #ifndef	BUILTIN_MMH
   "\tb            burst digest article.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
 #endif	/* !BUILTIN_MMH */
 #endif	/* LARGE */
   "\n  [DISPLAY]",
@@ -941,7 +941,7 @@
 	  if (mh_s_folder[current_folder].max_article) {
 	    print_mode_line(japanese ?
 			    "フォルダ(%s)は空ではありません。" :
-			    "Folder(%s) does not empty.",
+			    "Folder(%s) is not empty.",
 			    mh_s_folder[current_folder].folder_name);
 	    term_bell();
 	    sleep(ERROR_SLEEP);
@@ -1478,7 +1478,7 @@
 	  case 'c':		/* 全記事マーク		*/
 	    switch (yes_or_no(MARK_YN_MODE,
 			      "全記事をマークしてよろしいですか?",
-			      "Mark all articles.Are you sure?")) {
+			      "Mark all articles. Are you sure?")) {
 	    case 1:	/* READ		*/
 	      j = READ_MARK;
 	      break;
@@ -1523,7 +1523,7 @@
 		if (!j) {
 		  if (yes_or_no(NORMAL_YN_MODE,
 				"フォルダ(%s)を新規作成しますか?",
-				"Create folder(%s).Are you sure?",
+				"Create folder(%s). Are you sure?",
 				buff1)) {
 		    if (!mh_create_folder(buff1)) {
 		      j = 1;
@@ -1637,7 +1637,7 @@
 	    break;
 	  case '%':		/* ソート		*/
 	    if (yes_or_no(NORMAL_YN_MODE, "記事をソートしてよろしいですか?",
-			  "Sort articles.Are you sure?")) {
+			  "Sort articles?")) {
 	      print_mode_line(japanese ? "ソート中です。" :
 			      "Sorting.");
 	      save_position = article_list[current_article].real_number;
@@ -1669,7 +1669,7 @@
 	    if (j) {
 	      if (yes_or_no(CARE_YN_MODE,
 			    "マークされた記事を全て削除してよろしいですか?",
-			    "Delete all marked articles.Are you sure?")) {
+			    "Delete all marked articles. Are you sure?")) {
 		print_mode_line(japanese ? "削除中です。" :
 				"Removing.");
 		save_position = article_list[current_article].real_number;
@@ -1736,7 +1736,7 @@
 	    break;
 	  case '#':		/* 記事パック		*/
 	    if (yes_or_no(NORMAL_YN_MODE, "記事をパックしてよろしいですか?",
-			  "Pack articles.Are you sure?")) {
+			  "Pack articles. Confirm")) {
 	      print_mode_line(japanese ? "パック中です。" :
 			      "Packing.");
 #ifdef	BUILTIN_MMH
@@ -1890,7 +1890,7 @@
 #ifndef	BUILTIN_MMH
 	  case 'b':		/* バースト		*/
 	    if (yes_or_no(NORMAL_YN_MODE, "記事をバーストしてよろしいですか?",
-			  "Burst article.Are you sure?")) {
+			  "Burst article. Are you sure?")) {
 	      print_mode_line(japanese ? "バースト中です。" :
 			      "Bursting.");
 	      save_position = article_list[current_article].real_number;
@@ -3745,7 +3745,7 @@
   if (stat(buff2, &stat_buff)) {
     if (!yes_or_no(NORMAL_YN_MODE,
 		   "フォルダ(%s)を新規作成しますか?",
-		   "Create folder(%s).Are you sure?",
+		   "Create folder(%s). Confirm",
 		   buff1)) {
       return(1);
     }
@@ -3832,7 +3832,7 @@
 #endif	/* !HAVE_FILES */
   } else {
     if (yes_or_no(NORMAL_YN_MODE, "フォルダ(%s)を新規作成しますか?",
-		  "Create folder(%s).Are you sure?",
+		  "Create folder(%s) ?",
 		  buff1)) {
       if (mh_create_folder(buff1)) {
 	return(1);
@@ -3943,7 +3943,7 @@
       for (current_folder = *folder_ptr - 1; current_folder >= 0;
 	   current_folder--) {
 	if (strindex(mh_s_folder[current_folder].folder_name, str)) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *folder_ptr = current_folder;
 	  return(0);
 	}
@@ -3952,7 +3952,7 @@
       for (current_folder = *folder_ptr + 1; current_folder < max_number;
 	   current_folder++) {
 	if (strindex(mh_s_folder[current_folder].folder_name, str)) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *folder_ptr = current_folder;
 	  return(0);
 	}
@@ -4355,7 +4355,7 @@
 	printf("RENAME:%s->%s\n", buff1, buff2);
 #endif	/* DEBUG */
 	if (!stat(buff2, &stat_buff)) {
-	  print_fatal("Program error.Illegal temporary message.");
+	  print_fatal("Program error. Illegal temporary message.");
 	  j = -1;
 	} else {
 	  if (rename(buff1, buff2)) {
@@ -4379,7 +4379,7 @@
     printf("RENAME:%s->%s\n", buff1, buff2);
 #endif	/* DEBUG */
     if (!stat(buff2, &stat_buff)) {
-      print_fatal("Program error.Illegal target message number.");
+      print_fatal("Program error. Illegal target message number.");
       status = 1;
     } else {
       if (rename(buff1, buff2)) {
Index: mnews-1.22-qnx/src/mimepart.c
diff -u mnews-1.22-qnx/src/mimepart.c:1.1.1.1 mnews-1.22-qnx/src/mimepart.c:1.1.2.2
--- mnews-1.22-qnx/src/mimepart.c:1.1.1.1	Wed Nov 27 10:12:22 2002
+++ mnews-1.22-qnx/src/mimepart.c	Fri Dec 13 08:28:51 2002
@@ -238,12 +238,12 @@
   "\n  [MOVE]",
   "\tk or ^P      previous part.",
   "\tj or ^N      next part.",
-  "\t^U or ^B     previous page part.",
-  "\t^D, ^F or ^V next page part.",
+  "\t^U or ^B     previous page.",
+  "\t^D, ^F or ^V next page.",
   "\t<            top part.",
   "\t>            last part.",
   "\tTAB          jump to specified part.",
-  "\t             (Please input part number.)",
+  "\t             (enter part number.)",
   "\to, q or return",
   "\t             exit from part select mode.",
   "\n  [MARK]",
@@ -256,13 +256,13 @@
   "\n  [POST]",
   "\ta            post new article.",
   "\tf            follow.",
-  "\tF            follow with original part.",
+  "\tF            follow with quoting."
 #endif	/* NEWSPOST */
 #ifdef	MAILSEND
   "\n  [SEND]",
   "\tm            mail.",
   "\tr            reply.",
-  "\tR            reply with original part.",
+  "\tR            reply with quoting."
   "\t=            forward.",
 #ifdef	LARGE
   "\t~            relay.",
@@ -270,11 +270,11 @@
 #endif	/* MAILSEND */
   "\n  [SAVE]",
   "\ts            save part.",
-  "\t             (Please input file name.If file exists, please select",
+  "\t             (enter file name. If file exists, select",
   "\t              y:append n:abort or o:overwrite.)",
 #ifdef	MH
   "\tO            save part in MH folder.",
-  "\t             (Please Input MH folder name.)",
+  "\t             (enter MH folder name.)",
 #endif	/* MH */
 #endif	/* !SMALL */
   (char*)NULL,
@@ -375,7 +375,7 @@
 	sprintf(buff, "%s %s", ptr, file_name);
 	print_mode_line(japanese ?
 			"\"%s\"の終了を待機しています。" :
-			"Waiting for \"%s\" exit.", ptr);
+			"Waiting \"%s\" to exit.", ptr);
 	term_system(buff);
 #ifdef	X68K
 	_iocs_crtmod(0x10);
@@ -413,7 +413,7 @@
     if (!stat(file_name, &stat_buff)) {
       if (!yes_or_no(NORMAL_YN_MODE,
 		     "ファイル存在します。上書きしますか?",
-		     "File exists.Overwrite?")) {
+		     "File exists. Overwrite?")) {
 	return(-1);
       }
     }
@@ -1637,7 +1637,7 @@
   print_title();
   if (!yes_or_no(NORMAL_YN_MODE,
 		 "MIME エンコードによるファイルを添付しますか?",
-		 "Add MIME encoded file?")) {
+		 "Attach MIME encoded file?")) {
     return;
   }
   while (1) {
Index: mnews-1.22-qnx/src/mnews.c
diff -u mnews-1.22-qnx/src/mnews.c:1.1.1.1 mnews-1.22-qnx/src/mnews.c:1.1.2.5
--- mnews-1.22-qnx/src/mnews.c:1.1.1.1	Wed Nov 27 10:12:21 2002
+++ mnews-1.22-qnx/src/mnews.c	Tue Dec 17 02:17:08 2002
@@ -260,17 +260,17 @@
 #ifndef	SMALL
   "\n  [SEARCH]",
   "\t/            forward search subjects.",
-  "\t             (Please input search pattern.)",
+  "\t             (Enter search pattern.)",
   "\t\\            backward search subjects.",
-  "\t             (Please input search pattern.)",
+  "\t             (Enter search pattern.)",
 #ifdef	LARGE
   "\t(            forward search articles.",
-  "\t             (Please input search pattern.)",
+  "\t             (Enter search pattern.)",
   "\t)            backward search articles.",
-  "\t             (Please input search pattern.)",
+  "\t             (Enter search pattern.)",
   "\n  [PRINT]",
   "\t@            print out article.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
 #endif	/* LARGE */
   "\n  [ETC]",
   "\t|            execute pipe command.",
@@ -664,8 +664,8 @@
   smtp_status = smtp_open();
   if (smtp_status != SMTP_OK) {
     if (smtp_status != SMTP_ERR_RSV) {
-      print_mode_line(japanese ? "SMTP/MTAP サーバと接続できませんでした。" :
-		    "Can't connect mail SMTP/MTAP server.");
+      print_warning(japanese ? "SMTP/MTAP サーバと接続できませんでした。" :
+		    "Can't connect to mail SMTP/MTAP server.");
       term_bell();
       sleep(ERROR_SLEEP);
     }
@@ -675,8 +675,8 @@
   pop3_status = pop3_open();
   if (pop3_status != POP3_OK) {
     if (pop3_status != POP3_ERR_RSV) {
-      print_mode_line(japanese ? "POP3/MSPL サーバと接続できませんでした。" :
-		    "Can't connect POP3/MSPL server.");
+      print_warning(japanese ? "POP3/MSPL サーバと接続できませんでした。" :
+		    "Can't connect to POP3/MSPL server.");
       term_bell();
       sleep(ERROR_SLEEP);
     }
@@ -2020,7 +2020,7 @@
   }
   if (*search_string) {
     print_mode_line(japanese ? "検索中です。(^C:中断)" :
-		    "Searching.(^C:abort)");
+		    "Searching. (^C:abort)");
     return(search_string);
   }
   print_mode_line(japanese ? "検索を中止しました。" : "Search aborted.");
@@ -3680,7 +3680,7 @@
       status = mkdir(dir_name, S_IREAD | S_IWRITE | S_IEXEC);
     }
     if (mode && status) {
-      print_mode_line(japanese ? "\"%s\"が作成できませんでした。" :
+      print_warning(japanese ? "\"%s\"が作成できませんでした。" :
 		      "Can't create \"%s\".", dir_name);
       term_bell();
       sleep(ERROR_SLEEP);
@@ -3858,6 +3858,7 @@
 	print_code = SJIS_CODE;
 	key = 0x0c;
 	break;
+#ifndef LOCK_LANGUAGE
       case 'x':		/* 英語/日本語モード	*/
 	japanese = !japanese;
 	if (japanese) {
@@ -3867,6 +3868,7 @@
 	}
 	key = 0x0c;
 	break;
+#endif /* !LOCK_LANGUAGE */
 #ifdef	MAILSEND
       case 'm':		/* メール送信		*/
 	if (mask & NEWS_MODE_MASK) {
@@ -4216,7 +4218,7 @@
 #endif	/* !IGNORE_EDITOR */
   }
   if (status) {
-    print_mode_line(japanese ? "エディタの起動に失敗しました。" :
+    print_warning(japanese ? "エディタの起動に失敗しました。" :
 		    "Execute editor failed.");
     term_bell();
     sleep(ERROR_SLEEP);
@@ -4255,17 +4257,17 @@
   }
   switch (status) {
   case NNTP_ERR_AUTH:
-    print_mode_line(japanese ? "ユーザ認証に失敗しました。" :
+    print_warning(japanese ? "ユーザ認証に失敗しました。" :
 		    "Authentication failed.");
     break;
   case NNTP_ERR_SERV:
-    print_mode_line(japanese ? "ニュースサーバがサービスを中止しています。" :
-		    "News server service discontinued.");
+    print_fatal(japanese ? "ニュースサーバがサービスを中止しています。" :
+		    "News server service currently unavailable.");
     break;
   case NNTP_OK:
     break;
   default:
-    print_mode_line(japanese ? "ニュースサーバと接続できませんでした。" :
+    print_warning(japanese ? "ニュースサーバと接続できませんでした。" :
 		    "Can't connect news server.");
     break;
   }
@@ -4421,7 +4423,7 @@
       }
     }
     if (status) {
-      print_fatal("Program error.too many open files \"%s\".", file_name);
+      print_fatal("Program error. too many open files \"%s\".", file_name);
     }
   }
   return(fp);
@@ -4446,7 +4448,7 @@
       return(0);
     }
   }
-  print_fatal("Program error.unexpected close file \"%s\".", file_name);
+  print_fatal("Program error. unexpected close file \"%s\".", file_name);
   return(1);
 }
 
@@ -4473,7 +4475,7 @@
     }
   }
   if (status) {
-    print_fatal("Program error.unexpected unlink file \"%s\".", file_name);
+    print_fatal("Program error. unexpected unlink file \"%s\".", file_name);
   }
   return(unlink(file_name));
 }
Index: mnews-1.22-qnx/src/newspost.c
diff -u mnews-1.22-qnx/src/newspost.c:1.1.1.1 mnews-1.22-qnx/src/newspost.c:1.1.2.3
--- mnews-1.22-qnx/src/newspost.c:1.1.1.1	Wed Nov 27 10:12:21 2002
+++ mnews-1.22-qnx/src/newspost.c	Fri Dec 13 08:28:52 2002
@@ -78,7 +78,7 @@
 
 #ifdef	SEND_CONFIRM
   if (!yes_or_no(NORMAL_YN_MODE, "新しい記事を投稿しますか?",
-		 "Post new article.Are you sure?")) {
+		 "Compose a new article?")) {
     return(1);
   }
 #endif	/* SEND_CONFIRM */
@@ -214,7 +214,7 @@
 
 #ifdef	SEND_CONFIRM
   if (!yes_or_no(NORMAL_YN_MODE, "記事をフォローしますか?",
-		 "Follow article.Are you sure?")) {
+		 "Compose a followup article?")) {
     return(1);
   }
 #endif	/* SEND_CONFIRM */
@@ -361,7 +361,7 @@
 	ptr1 = follow_message;
       } else {
 	ptr1 = (japanese ? "%Iの記事において\n%F{さん,私}は書きました。\n" :
-		"In article %I\n%F writes:\n");
+		"%F wrote in article %I:\n");
 #ifdef	SJIS_SRC
 	sjis_to_euc(buff1, ptr1);
 	ptr1 = buff1;
@@ -412,7 +412,7 @@
     if (status) {
       if (status > 0) {
 	print_mode_line(japanese ? "ニュースのフォローに失敗しました。" :
-			"Post follow article failed.");
+			"Post followup article failed.");
 	term_bell();
 	sleep(ERROR_SLEEP);
       } else if (status == -2) {
@@ -524,7 +524,7 @@
   fprintf(fp, "%s %s %s\n\n", CONTROL_FIELD, CANCEL_CONTROL, message_buff);
   fclose(fp);
   if (!yes_or_no(CARE_YN_MODE, "記事をキャンセルしてよろしいですか?",
-		 "Cancel article.Are you sure?")) {
+		 "Cancel article. Are you sure?")) {
     funlink2(tmp_file);
     return(1);
   }
@@ -1150,7 +1150,7 @@
   if (char_mask & (KANA_MASK | HOJO_MASK)) {
     print_mode_line(japanese ?
 		    "警告 : 通常許されていない文字が含まれています。" :
-		    "Warning : Normally, unallowed character included.");
+		    "Warning : unallowed character seen.");
     term_bell();
     sleep(ERROR_SLEEP);
   }
@@ -1161,7 +1161,7 @@
    */
 
   switch (yes_or_no(SEND_YN_MODE, "記事を投稿してよろしいですか?",
-		    "Post article.Are you sure?")) {
+		    "Post article?")) {
   case 1:
     break;
   case 2:
@@ -1181,7 +1181,7 @@
     if (fcc_save(tmp_file1, from_buff, date_buff, fcc_buff)) {
       if (yes_or_no(NORMAL_YN_MODE,
 		    "FCC ファイルがセーブできませんでした。再編集しますか?",
-		    "Failed for FCC file save.Edit Again?")) {
+		    "Failed for FCC file save. Edit Again?")) {
 	funlink2(tmp_file1);
 	return(-2);
       }
@@ -1281,7 +1281,7 @@
   if (fp != (FILE*)NULL) {
     if ((!auto_sig_mode) &&
 	(!yes_or_no(NORMAL_YN_MODE, "signature%s ファイルをつけますか?",
-		    "Add signature%s file.Are you sure?", ptr2))) {
+		    "Add signature%s file. Confirm", ptr2))) {
       fclose(fp);
       fp = (FILE*)NULL;
     }
Index: mnews-1.22-qnx/src/pager.c
diff -u mnews-1.22-qnx/src/pager.c:1.1.1.1 mnews-1.22-qnx/src/pager.c:1.1.2.1
--- mnews-1.22-qnx/src/pager.c:1.1.1.1	Wed Nov 27 10:12:21 2002
+++ mnews-1.22-qnx/src/pager.c	Fri Nov 29 15:55:48 2002
@@ -261,8 +261,8 @@
   "\t^D           show next half page.(You can specify lines.)",
   "\tv or V       read article with all header.",
   "\t             ('V' decode MIME header.)",
-  "\t^            read referece article.(When NEWS mode only)",
-  "\t*            read Message-ID article.(When NEWS mode only)",
+  "\t^            read reference article. (in NEWS mode only)",
+  "\t*            specify article by Message-ID. (in NEWS mode only)",
   "\n  [MOVE]",
   "\tp            previous unread article.",
   "\tn            next unread article.",
@@ -273,24 +273,24 @@
   "\td            mark article and move to next unread.",
   "\tU            unmark article and move to previous.",
   "\tu            unmark article and move to next.",
-  "\tK            mark same subject as read.(When NEWS/BOARD mode only)",
+  "\tK            mark same subject as read. (in NEWS/BOARD mode only)",
   "\n  [POST]",
-  "\tf            follow.(When NEWS/BOARD mode only)",
-  "\tF            follow with original article.(When NEWS/BOARD mode only)",
+  "\tf            followup. (in NEWS/BOARD mode only)",
+  "\tF            follow with quoting. (in NEWS/BOARD mode only)",
   "\n  [SEND]",
   "\tr            reply.",
-  "\tR            reply with original article.",
-  "\t= or f       forward.(f can use mail mode only)",
+  "\tR            reply with quoting."
+  "\t= or f       forward. (f in mail mode only)",
 #ifdef	LARGE
   "\t~            relay.",
 #endif	/* LARGE */
   "\n  [SAVE]",
   "\ts            save article.",
-  "\t             (Please input file name.If file exists, please select",
+  "\t             (enter file name. If file exists, select",
   "\t              y:append n:abort or o:overwrite.)",
 #ifdef	MH
   "\tO            save article in MH folder.",
-  "\t             (Please Input MH folder name.)",
+  "\t             (enter MH folder name.)",
 #endif	/* MH */
   "\n  [SEARCH]",
 #else	/* !MNEWS */
@@ -313,11 +313,11 @@
   "\tR, r or ^L   redisplay screen.",
 #endif	/* !MNEWS */
   "\t?            show help screen.",
-  "\tA            print Japanese no conversion.",
-  "\tE            print Japanese EUC code.",
-  "\tJ            print Japanese JIS code.",
-  "\tS            print Japanese SJIS code.",
-  "\t&            print ROT 13/47 converted code.",
+  "\tA            display with no code conversion.",
+  "\tE            display in Japanese EUC code.",
+  "\tJ            display in Japanese JIS code.",
+  "\tS            display in Japanese SJIS code.",
+  "\t&            undecode ROT 13/47 converted code.",
 #ifndef	MNEWS
   "\t=            show line number.",
 #endif	/* !MNEWS */
@@ -926,7 +926,7 @@
 	    number = file;
 	    loop = -1;
 	  } else {
-	    error_msg = "Already help mode.";
+	    error_msg = "Already in help mode.";
 	  }
 	  break;
 	case 'A':		/* ASCII モード		*/
Index: mnews-1.22-qnx/src/rmail.c
diff -u mnews-1.22-qnx/src/rmail.c:1.1.1.1 mnews-1.22-qnx/src/rmail.c:1.1.2.3
--- mnews-1.22-qnx/src/rmail.c:1.1.1.1	Wed Nov 27 10:12:21 2002
+++ mnews-1.22-qnx/src/rmail.c	Fri Dec 13 08:28:53 2002
@@ -282,12 +282,12 @@
   "\tj or ^N      next folder.",
   "\tp            previous unread folder.",
   "\tn            next unread folder.",
-  "\t^U or ^B     previous page folder.",
-  "\t^D, ^F or ^V next page folder.",
+  "\t^U or ^B     previous page.",
+  "\t^D, ^F or ^V next page.",
   "\t<            top folder.",
   "\t>            last folder.",
   "\tTAB          jump to specified category/folder.",
-  "\t             (Please input folder name.)",
+  "\t             (enter folder name.)",
 #ifdef	LARGE
   "\tI            jump to new article folder.",
 #endif	/* LARGE */
@@ -299,17 +299,17 @@
 #endif	/* MAILSEND */
   "\n  [SEARCH]",
   "\t/            forward search pattern.",
-  "\t             (Please input search pattern.)",
+  "\t             (enter search pattern.)",
   "\t\\            backward search pattern.",
-  "\t             (Please input search pattern.)",
+  "\t             (enter search pattern.)",
   "\n  [DISPLAY]",
   "\tG            toggle news(board) group/folder print mode.",
-  "\t             (When top folder only)",
+  "\t             (in top folder only)",
   "\001",
   "\tC            create new folder.",
-  "\t             (Please input folder name.)",
+  "\t             (enter folder name.)",
   "\tDEL or BS    delete folder.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
 #endif	/* !SMALL */
   (char*)NULL,
   };
@@ -320,7 +320,7 @@
   "\n  [READ]",
   "\tSPACE, i or .",
   "\t             read article.",
-  "\tv or V       read article with all header.",
+  "\tv or V       read article with all headers.",
 #ifdef	MIME
   "\t             ('V' decode MIME header.)",
 #endif	/* MIME */
@@ -331,15 +331,15 @@
   "\n  [MOVE]",
   "\tk or ^P      previous article.",
   "\tj or ^N      next article.",
-  "\t^U or ^B     previous page article.",
-  "\t^D, ^F or ^V next page article.",
+  "\t^U or ^B     previous page.",
+  "\t^D, ^F or ^V next page.",
   "\t<            top article.",
   "\t>            last article.",
   "\tTAB          jump to specified article.",
-  "\t             (Please input article number.)",
+  "\t             (enter article number.)",
 #ifdef	LARGE
-  "\t{            previous delete mark article.",
-  "\t}            next delete mark article.",
+  "\t{            previous delete marked article.",
+  "\t}            next delete marked article.",
 #endif	/* LARGE */
   "\to, q or return",
   "\t             exit from article select mode.",
@@ -355,12 +355,12 @@
   "\tM            toggle multi mark and move to next.",
   "\tC            clear all saved mark and move to next.",
   "\tc            mark all articles.",
-  "\t             (Please select y:read n:abort or d:delete mark.)",
+  "\t             (confirm y:read n:abort or d:delete mark.)",
 #ifdef	MAILSEND
   "\n  [SEND]",
   "\tm            mail.",
   "\tr            reply.",
-  "\tR            reply with original article.",
+  "\tR            reply with quoting."
   "\t= or f       forward.",
 #ifdef	LARGE
   "\t~            relay.",
@@ -368,17 +368,17 @@
 #endif	/* MAILSEND */
   "\n  [SAVE]",
   "\ts            save article.",
-  "\t             (Please input file name.If file exists, please select",
+  "\t             (enter file name. If file exists, select",
   "\t              y:append n:abort or o:overwrite.)",
   "\n  [INCLUDE]",
-  "\tI            include new mail.",
-  "\tL            include UCB-mail format article file.",
-  "\t             (Please input file name.)",
+  "\tI            incorporate new mail.",
+  "\tL            incorporate from UCB-mail format article file.",
+  "\t             (enter file name.)",
   "\n  [DELETE/REORDER]",
   "\tDEL or BS    remove delete marked article.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
   "\t^            refile delete marked article.",
-  "\t             (Please input folder name.)",
+  "\t             (confirm with y/n)",
   "\n  [DISPLAY]",
   "\tl            toggle print read/delete article.",
   "\tt            toggle thread mode.",
@@ -758,7 +758,7 @@
 	  if (rmail_s_folder[current_folder].max_article > 0) {
 	    print_mode_line(japanese ?
 			    "フォルダ(%s)は空ではありません。" :
-			    "Folder(%s) does not empty.",
+			    "Folder(%s) is not empty.",
 			    rmail_s_folder[current_folder].folder_name);
 	    term_bell();
 	    sleep(ERROR_SLEEP);
@@ -1281,7 +1281,7 @@
 	  case 'c':		/* 全記事マーク		*/
 	    switch (yes_or_no(MARK_YN_MODE,
 			      "全記事をマークしてよろしいですか?",
-			      "Mark all articles.Are you sure?")) {
+			      "Mark all articles. Are you sure?")) {
 	    case 1:	/* READ		*/
 	      j = READ_MARK;
 	      break;
@@ -1322,7 +1322,7 @@
 		if (!j)  {
 		  if (yes_or_no(NORMAL_YN_MODE,
 				"フォルダ(%s)を新規作成しますか?",
-				"Create folder(%s).Are you sure?",
+				"Create folder(%s) ?",
 				buff)) {
 		    if (!rmail_create_folder(buff)) {
 		      j = 1;
@@ -1368,7 +1368,7 @@
 	    if (j) {
 	      if (yes_or_no(CARE_YN_MODE,
 			    "マークされた記事を全て削除してよろしいですか?",
-			    "Delete all marked articles.Are you sure?")) {
+			    "Delete all marked articles. Are you sure?")) {
 		rmail_update(1, (char*)NULL);
 		rmail_count(current_folder);
 		rmail_get_list();
@@ -3043,7 +3043,7 @@
       for (current_folder = *folder_ptr - 1; current_folder >= 0;
 	   current_folder--) {
 	if (strindex(rmail_s_folder[current_folder].folder_name, str)) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *folder_ptr = current_folder;
 	  return(0);
 	}
@@ -3052,7 +3052,7 @@
       for (current_folder = *folder_ptr + 1; current_folder < max_folder;
 	   current_folder++) {
 	if (strindex(rmail_s_folder[current_folder].folder_name, str)) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *folder_ptr = current_folder;
 	  return(0);
 	}
Index: mnews-1.22-qnx/src/ucbmail.c
diff -u mnews-1.22-qnx/src/ucbmail.c:1.1.1.1 mnews-1.22-qnx/src/ucbmail.c:1.1.2.3
--- mnews-1.22-qnx/src/ucbmail.c:1.1.1.1	Wed Nov 27 10:12:21 2002
+++ mnews-1.22-qnx/src/ucbmail.c	Fri Dec 13 08:28:53 2002
@@ -278,12 +278,12 @@
   "\tj or ^N      next folder.",
   "\tp            previous unread folder.",
   "\tn            next unread folder.",
-  "\t^U or ^B     previous page folder.",
-  "\t^D, ^F or ^V next page folder.",
+  "\t^U or ^B     previous page.",
+  "\t^D, ^F or ^V next page.",
   "\t<            top folder.",
   "\t>            last folder.",
   "\tTAB          jump to specified category/folder.",
-  "\t             (Please input folder name.)",
+  "\t             (enter folder name.)",
 #ifdef	LARGE
   "\tI            jump to new article folder.",
 #endif	/* LARGE */
@@ -295,17 +295,17 @@
 #endif	/* MAILSEND */
   "\n  [SEARCH]",
   "\t/            forward search pattern.",
-  "\t             (Please input search pattern.)",
+  "\t             (enter search pattern.)",
   "\t\\            backward search pattern.",
-  "\t             (Please input search pattern.)",
+  "\t             (enter search pattern.)",
   "\n  [DISPLAY]",
   "\tG            toggle news(board) group/folder print mode.",
-  "\t             (When top folder only)",
+  "\t             (in top folder only)",
   "\001",
   "\tC            create new folder.",
-  "\t             (Please input folder name.)",
+  "\t             (enter folder name.)",
   "\tDEL or BS    delete folder.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
 #endif	/* !SMALL */
   (char*)NULL,
   };
@@ -316,7 +316,7 @@
   "\n  [READ]",
   "\tSPACE, i or .",
   "\t             read article.",
-  "\tv or V       read article with all header.",
+  "\tv or V       read article with all headers.",
 #ifdef	MIME
   "\t             ('V' decode MIME header.)",
 #endif	/* MIME */
@@ -328,15 +328,15 @@
   "\tk or ^P      previous article.",
   "\tj or ^N      next article.",
 #ifdef	LARGE
-  "\t{            previous delete mark article.",
-  "\t}            next delete mark article.",
+  "\t{            previous delete marked article.",
+  "\t}            next delete marked article.",
 #endif	/* LARGE */
   "\t^U or ^B     previous page article.",
   "\t^D, ^F or ^V next page article.",
   "\t<            top article.",
   "\t>            last article.",
   "\tTAB          jump to specified article.",
-  "\t             (Please input article number.)",
+  "\t             (enter article number.)",
   "\to, q or return",
   "\t             exit from article select mode.",
   "\n  [MARK]",
@@ -351,12 +351,12 @@
   "\tM            toggle multi mark and move to next.",
   "\tC            clear all saved mark and move to next.",
   "\tc            mark all articles.",
-  "\t             (Please select y:read n:abort or d:delete mark.)",
+  "\t             (confirm y:read n:abort or d:delete mark.)",
 #ifdef	MAILSEND
   "\n  [SEND]",
   "\tm            mail.",
   "\tr            reply.",
-  "\tR            reply with original article.",
+  "\tR            reply with quoting.",
   "\t= or f       forward.",
 #ifdef	LARGE
   "\t~            relay.",
@@ -364,17 +364,17 @@
 #endif	/* MAILSEND */
   "\n  [SAVE]",
   "\ts            save article.",
-  "\t             (Please input file name.If file exists, please select",
+  "\t             (enter file name. If file exists, select",
   "\t              y:append n:abort or o:overwrite.)",
   "\n  [INCLUDE]",
-  "\tI            include new mail.",
-  "\tL            include UCB-mail format article file.",
-  "\t             (Please input file name.)",
+  "\tI            incorporate new mail.",
+  "\tL            incorporate from UCB-mail format article file.",
+  "\t             (enter file name.)",
   "\n  [DELETE/REORDER]",
   "\tDEL or BS    remove delete marked article.",
-  "\t             (Please make sure y/n.)",
+  "\t             (confirm with y/n)",
   "\t^            refile delete marked article.",
-  "\t             (Please input folder name.)",
+  "\t             (enter folder name.)",
   "\n  [DISPLAY]",
   "\tl            toggle print read/delete article.",
   "\tt            toggle thread mode.",
@@ -755,7 +755,7 @@
 	  if (ucbmail_s_folder[current_folder].max_article > 0) {
 	    print_mode_line(japanese ?
 			    "フォルダ(%s)は空ではありません。" :
-			    "Folder(%s) does not empty.",
+			    "Folder(%s) is not empty.",
 			    ucbmail_s_folder[current_folder].folder_name);
 	    term_bell();
 	    sleep(ERROR_SLEEP);
@@ -1278,7 +1278,7 @@
 	  case 'c':		/* 全記事マーク		*/
 	    switch (yes_or_no(MARK_YN_MODE,
 			      "全記事をマークしてよろしいですか?",
-			      "Mark all articles.Are you sure?")) {
+			      "Mark all articles. Are you sure?")) {
 	    case 1:	/* READ		*/
 	      j = READ_MARK;
 	      break;
@@ -1319,7 +1319,7 @@
 		if (!j)  {
 		  if (yes_or_no(NORMAL_YN_MODE,
 				"フォルダ(%s)を新規作成しますか?",
-				"Create folder(%s).Are you sure?",
+				"Create folder(%s) ?",
 				buff)) {
 		    if (!ucbmail_create_folder(buff)) {
 		      j = 1;
@@ -1365,7 +1365,7 @@
 	    if (j) {
 	      if (yes_or_no(CARE_YN_MODE,
 			    "マークされた記事を全て削除してよろしいですか?",
-			    "Delete all marked articles.Are you sure?")) {
+			    "Delete all marked articles. Are you sure?")) {
 		ucbmail_update(1, (char*)NULL);
 		ucbmail_count(current_folder);
 		ucbmail_get_list();
@@ -2881,7 +2881,7 @@
       for (current_folder = *folder_ptr - 1; current_folder >= 0;
 	   current_folder--) {
 	if (strindex(ucbmail_s_folder[current_folder].folder_name, str)) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *folder_ptr = current_folder;
 	  return(0);
 	}
@@ -2890,7 +2890,7 @@
       for (current_folder = *folder_ptr + 1; current_folder < max_folder;
 	   current_folder++) {
 	if (strindex(ucbmail_s_folder[current_folder].folder_name, str)) {
-	  print_mode_line(japanese ? "見つけました。" : "Search succeed.");
+	  print_mode_line(japanese ? "見つけました。" : "Found.");
 	  *folder_ptr = current_folder;
 	  return(0);
 	}
Index: mnews-1.22-qnx/src/youbin.c
diff -u mnews-1.22-qnx/src/youbin.c:1.1.1.1 mnews-1.22-qnx/src/youbin.c:1.1
--- mnews-1.22-qnx/src/youbin.c:1.1.1.1	Wed Nov 27 10:12:22 2002
+++ mnews-1.22-qnx/src/youbin.c	Wed Nov 27 10:12:22 2002
@@ -22,7 +22,7 @@
  *
  * IPv6 support: H.YOSHIFUJI <yoshfuji@ecei.tohoku.ac.jp>, 1999-11/19,22,24.
  *
- * 1.1.1.1  2002/11/27 01:12:22
+ * 1.1  2002/11/27 01:12:22
  */
 
 #include <sys/types.h>