From svnnotify ＠ sourceforge.jp  Wed Oct  1 14:09:59 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 01 Oct 2014 14:09:59 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2NjldIFJGQzQyNTAsIDQyNTMg44Gr5a6a?=
 =?utf-8?b?576p44GV44KM44Gm44GE44KL44Oh44OD44K744O844K444GM5a6a576p44GV?=
 =?utf-8?b?44KM44Gm44GE44Gq44GE44Gu44Gn6L+95Yqg?=
Message-ID: <1412140199.869005.28859.nullmailer@users.sourceforge.jp>

Revision: 5669
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5669
Author:   maya
Date:     2014-10-01 14:09:56 +0900 (Wed, 01 Oct 2014)
Log Message:
-----------
RFC4250,4253 に定義されているメッセージが定義されていないので追加

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ssh.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h	2014-09-27 13:41:03 UTC (rev 5668)
+++ trunk/ttssh2/ttxssh/ssh.h	2014-10-01 05:09:56 UTC (rev 5669)
@@ -191,6 +191,10 @@
 #define SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE          9
 #define SSH2_DISCONNECT_CONNECTION_LOST                  10
 #define SSH2_DISCONNECT_BY_APPLICATION                   11
+#define SSH2_DISCONNECT_TOO_MANY_CONNECTIONS             12
+#define SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER           13
+#define SSH2_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE   14
+#define SSH2_DISCONNECT_ILLEGAL_USER_NAME                15
 
 #define SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED    1
 #define SSH2_OPEN_CONNECT_FAILED                 2

From svnnotify ＠ sourceforge.jp  Wed Oct  1 14:12:17 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 01 Oct 2014 14:12:17 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2NzBdICDmlLnniYjlsaXmrbTjgpLmm7Q=?=
 =?utf-8?b?5paw?=
Message-ID: <1412140337.187203.4851.nullmailer@users.sourceforge.jp>

Revision: 5670
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5670
Author:   maya
Date:     2014-10-01 14:12:16 +0900 (Wed, 01 Oct 2014)
Log Message:
-----------
改版履歴を更新

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2014-10-01 05:09:56 UTC (rev 5669)
+++ trunk/doc/en/html/about/history.html	2014-10-01 05:12:16 UTC (rev 5670)
@@ -43,6 +43,7 @@
       <li>upgraded TTSSH to <a href="#ttssh_2.71">2.71</a></li>
       <li>added the Traditional Chinese.lng language file. Special thanks to Wei Yan.</li>
       <li>added support for 64bit Cygwin connection automatically.</li>
+      <!--li>64bit?cyglaunch.exe????????</li-->
     </ul>
   </li>
 </ul>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2014-10-01 05:09:56 UTC (rev 5669)
+++ trunk/doc/ja/html/about/history.html	2014-10-01 05:12:16 UTC (rev 5670)
@@ -43,6 +43,7 @@
       <li><a href="#ttssh_2.71">TTSSH(2.71)</a>\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD\x81B</li>
       <li>\x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82?\x86\x8D\x91\x8C\xEA(\x94??\x9A)(Traditional Chinese.lng)\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81BWei Yan\x8E\x81\x82?\xB4\x8E?\xB5\x82?\xB7\x81B</li>
       <li>64bit Cygwin\x82??\xA9\x93\xAE\x90?\xB1\x82?Ή\x9E\x82\xB5\x82\xBD\x81B</li>
+      <li>64bit\x94\xC5cyglaunch.exe\x82?\xAF\x8D\xAB\x82\xF0\x82\xE2\x82?\xBD\x81B</li>
     </ul>
   </li>
 </ul>

From svnnotify ＠ sourceforge.jp  Wed Oct  1 14:47:10 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 01 Oct 2014 14:47:10 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2NzFdICBDeWd3aW4g44Gu44Kk44Oz44K5?=
 =?utf-8?b?44OI44O844Or5YWI44KS5o6i44GZ5pa55rOV44KS5aSJ5pu044GX44Gf?=
Message-ID: <1412142430.780277.6027.nullmailer@users.sourceforge.jp>

Revision: 5671
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5671
Author:   maya
Date:     2014-10-01 14:46:33 +0900 (Wed, 01 Oct 2014)
Log Message:
-----------
Cygwin のインストール先を探す方法を変更した

Modified Paths:
--------------
    trunk/cygterm/cyglaunch.c
    trunk/installer/cygtool/cygtool.c
    trunk/installer/release/TERATERM.INI
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/cygterm/cyglaunch.c
===================================================================
--- trunk/cygterm/cyglaunch.c	2014-10-01 05:12:16 UTC (rev 5670)
+++ trunk/cygterm/cyglaunch.c	2014-10-01 05:46:33 UTC (rev 5671)
@@ -23,7 +23,7 @@
 //
 void OnCygwinConnection(char *CygwinDirectory, char *cmdline)
 {
-	char file[MAX_PATH];
+	char file[MAX_PATH], *filename;
 	char c, *envptr, *envbuff;
 	int envbufflen;
 	char *exename = "cygterm.exe";
@@ -31,38 +31,31 @@
 	STARTUPINFO si;
 	PROCESS_INFORMATION pi;
 
-	envptr = getenv("PATH");
-	if (strstr(envptr, "cygwin\\bin") != NULL) {
-		goto found_path;
+	if (strlen(CygwinDirectory) > 0) {
+		if (SearchPath(CygwinDirectory, "bin\\cygwin1", ".dll", sizeof(file), file, &filename) > 0) {
+			goto found_dll;
+		}
 	}
-	if (strstr(envptr, "cygwin64\\bin") != NULL) {
+
+	if (SearchPath(NULL, "cygwin1", ".dll", sizeof(file), file, &filename) > 0) {
 		goto found_path;
 	}
 
-	_snprintf(file, MAX_PATH, "%s\\bin", CygwinDirectory);
-	if (GetFileAttributes(file) != -1) { // open success
-		goto found_dll;
-	}
-
-	strcpy(file, "C:\\cygwin\\bin");
 	for (c = 'C' ; c <= 'Z' ; c++) {
-		file[0] = c;
-		if (GetFileAttributes(file) != -1) { // open success
+		char tmp[MAX_PATH];
+		sprintf(tmp, "%c:\\cygwin\\bin;%c:\\cygwin64\\bin", c, c);
+		if (SearchPath(tmp, "cygwin1", ".dll", sizeof(file), file, &filename) > 0) {
 			goto found_dll;
 		}
 	}
-	strcpy(file, "C:\\cygwin64\\bin");
-	for (c = 'C' ; c <= 'Z' ; c++) {
-		file[0] = c;
-		if (GetFileAttributes(file) != -1) { // open success
-			goto found_dll;
-		}
-	}
 
 	MessageBox(NULL, "Can't find Cygwin directory.", "ERROR", MB_OK | MB_ICONWARNING);
 	return;
 
 found_dll:;
+	envptr = getenv("PATH");
+	file[strlen(file)-12] = '\0'; // delete "\\cygwin1.dll"
+		MessageBox(NULL, file, "a", MB_OK);
 	if (envptr != NULL) {
 		envbufflen = strlen(file) + strlen(envptr) + 7; // "PATH="(5) + ";"(1) + NUL(1)
 		if ((envbuff=malloc(envbufflen)) == NULL) {

Modified: trunk/installer/cygtool/cygtool.c
===================================================================
--- trunk/installer/cygtool/cygtool.c	2014-10-01 05:12:16 UTC (rev 5670)
+++ trunk/installer/cygtool/cygtool.c	2014-10-01 05:46:33 UTC (rev 5671)
@@ -7,67 +7,44 @@
 
 int __stdcall FindCygwinPath(char *CygwinDirectory, char *Dir, int Dirlen)
 {
-	char c, *envptr, *p, *p2;
+	char file[MAX_PATH], *filename;
+	char c;
 
-	envptr = getenv("PATH");
-	if (envptr == NULL) {
-		return 0;
-	}
+	if (strlen(CygwinDirectory) > 0) {
+		if (SearchPath(CygwinDirectory, "bin\\cygwin1", ".dll", sizeof(file), file, &filename) > 0) {
 #ifdef EXE
-	printf("  PATH => %s\n", envptr);
+			printf("  %s from CygwinDirectory\n", file);
 #endif
-	if ((p = strstr(envptr, "cygwin\\bin")) != NULL) {
-		goto found_path;
+			goto found_dll;
+		}
 	}
-	if ((p = strstr(envptr, "cygwin64\\bin")) != NULL) {
-		goto found_path;
-	}
 
-	_snprintf_s(Dir, Dirlen, _TRUNCATE, "%s\\bin", CygwinDirectory);
-	if (GetFileAttributes(Dir) != -1) { // open success
+	if (SearchPath(NULL, "cygwin1", ".dll", sizeof(file), file, &filename) > 0) {
+#ifdef EXE
+		printf("  %s from PATH\n", file);
 		goto found_dll;
+#endif
 	}
 
-	_snprintf_s(Dir, Dirlen, _TRUNCATE, "C:\\cygwin\\bin");
 	for (c = 'C' ; c <= 'Z' ; c++) {
-		Dir[0] = c;
-		if (GetFileAttributes(Dir) != -1) { // open success
+		char tmp[MAX_PATH];
+		sprintf(tmp, "%c:\\cygwin\\bin;%c:\\cygwin64\\bin", c, c);
+		if (SearchPath(tmp, "cygwin1", ".dll", sizeof(file), file, &filename) > 0) {
+#ifdef EXE
+			printf("  %s from %c:\\\n", file, c);
+#endif
 			goto found_dll;
 		}
 	}
-	_snprintf_s(Dir, Dirlen, _TRUNCATE, "C:\\cygwin64\\bin");
-	for (c = 'C' ; c <= 'Z' ; c++) {
-		Dir[0] = c;
-		if (GetFileAttributes(Dir) != -1) { // open success
-			goto found_dll;
-		}
-	}
 
 	return 0;
 
 found_dll:;
-	Dir[strlen(Dir)-4] = '\0'; // delete "\\bin"
-	return 1;
-
-found_path:;
-	if ((p2 = strchr(p, ';')) == NULL) {
-		p2 += strlen(p);
+	memset(Dir, '\0', Dirlen);
+	if (Dirlen <= strlen(file) - 16) {
+		return 0;
 	}
-	else {
-		p2--;
-	}
-	while (envptr < p) {
-		p--;
-		if (*p == ';') {
-			p++;
-			break;
-		}
-	}
-	strncpy_s(Dir, Dirlen, p, _TRUNCATE);
-	if (p2 - p < Dirlen-1) {
-		Dir[p2 - p + 1] = '\0';
-	}
-	Dir[strlen(Dir)-4] = '\0'; // delete "\\bin"
+	memcpy(Dir, file, strlen(file) - 16); // delete "\\bin\\cygwin1.dll"
 	return 1;
 }
 
@@ -157,7 +134,7 @@
 	int res;
 	
 	printf("FindCygwinPath()\n");
-	res = FindCygwinPath("C:\\cygwin", file, file_len);
+	res = FindCygwinPath("", file, file_len);
 	printf("  result => %d\n", res);
 	if (!res) {
 		printf("\n");

Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2014-10-01 05:12:16 UTC (rev 5670)
+++ trunk/installer/release/TERATERM.INI	2014-10-01 05:46:33 UTC (rev 5671)
@@ -103,7 +103,7 @@
 AlphaBlend=255
 
 ; Cygwin install path
-CygwinDirectory=c:\cygwin
+CygwinDirectory=
 
 ; Viewlog Editor path
 ViewlogEditor=notepad.exe

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2014-10-01 05:12:16 UTC (rev 5670)
+++ trunk/teraterm/teraterm/vtwin.cpp	2014-10-01 05:46:33 UTC (rev 5671)
@@ -3727,7 +3727,7 @@
 //
 void CVTWindow::OnCygwinConnection()
 {
-	char file[MAX_PATH];
+	char file[MAX_PATH], *filename;
 	char c, *envptr, *envbuff=NULL;
 	int envbufflen;
 	char *exename = "cygterm.exe";
@@ -3736,33 +3736,23 @@
 	PROCESS_INFORMATION pi;
 	char uimsg[MAX_UIMSG];
 
-	envptr = getenv("PATH");
-	if (strstr(envptr, "cygwin\\bin") != NULL) {
-		goto found_path;
+	if (strlen(ts.CygwinDirectory) > 0) {
+		if (SearchPath(ts.CygwinDirectory, "bin\\cygwin1", ".dll", sizeof(file), file, &filename) > 0) {
+			goto found_dll;
+		}
 	}
-	if (strstr(envptr, "cygwin64\\bin") != NULL) {
+
+	if (SearchPath(NULL, "cygwin1", ".dll", sizeof(file), file, &filename) > 0) {
 		goto found_path;
 	}
 
-	_snprintf_s(file, sizeof(file), _TRUNCATE, "%s\\bin", ts.CygwinDirectory);
-	if (GetFileAttributes(file) != -1) { // open success
-		goto found_dll;
-	}
-
-	_snprintf_s(file, sizeof(file), _TRUNCATE, "C:\\cygwin\\bin");
 	for (c = 'C' ; c <= 'Z' ; c++) {
-		file[0] = c;
-		if (GetFileAttributes(file) != -1) { // open success
+		char tmp[MAX_PATH];
+		sprintf(tmp, "%c:\\cygwin\\bin;%c:\\cygwin64\\bin", c, c);
+		if (SearchPath(tmp, "cygwin1", ".dll", sizeof(file), file, &filename) > 0) {
 			goto found_dll;
 		}
 	}
-	_snprintf_s(file, sizeof(file), _TRUNCATE, "C:\\cygwin64\\bin");
-	for (c = 'C' ; c <= 'Z' ; c++) {
-		file[0] = c;
-		if (GetFileAttributes(file) != -1) { // open success
-			goto found_dll;
-		}
-	}
 
 	get_lang_msg("MSG_ERROR", uimsg, sizeof(uimsg), "ERROR", ts.UILanguageFile);
 	get_lang_msg("MSG_FIND_CYGTERM_DIR_ERROR", ts.UIMsg, sizeof(ts.UIMsg),
@@ -3771,6 +3761,8 @@
 	return;
 
 found_dll:;
+	envptr = getenv("PATH");
+	file[strlen(file)-12] = '\0'; // delete "\\cygwin1.dll"
 	if (envptr != NULL) {
 		envbufflen = strlen(file) + strlen(envptr) + 7; // "PATH="(5) + ";"(1) + NUL(1)
 		if ((envbuff = (char *)malloc(envbufflen)) == NULL) {

From svnnotify ＠ sourceforge.jp  Wed Oct  1 14:52:41 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 01 Oct 2014 14:52:41 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B5672=5D__shell_=E3=81=AE_CHANNEL_?=
 =?utf-8?b?44GM6ZaJ44GY44Gf44Go44GNIFNTSDJfTVNHX0RJU0NPTk5FQ1Qg44KS6YCB?=
 =?utf-8?b?5L+h44GZ44KL44Gu44KS44KE44KB44Gf?=
Message-ID: <1412142761.388064.26057.nullmailer@users.sourceforge.jp>

Revision: 5672
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5672
Author:   maya
Date:     2014-10-01 14:52:38 +0900 (Wed, 01 Oct 2014)
Log Message:
-----------
shell の CHANNEL が閉じたとき SSH2_MSG_DISCONNECT を送信するのをやめた
  #34403 SSH2でログアウト時に SSH2_MSG_DISCONNECT(SSH2_DISCONNECT_PROTOCOL_ERROR)

Ticket Links:
------------
    http://sourceforge.jp/projects/ttssh2/tracker/detail/34403

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2014-10-01 05:46:33 UTC (rev 5671)
+++ trunk/ttssh2/ttxssh/ssh.c	2014-10-01 05:52:38 UTC (rev 5672)
@@ -8556,6 +8556,11 @@
 	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
 
 	if (c->type == TYPE_SHELL) {
+		// notify_closed_connection() \x82\xA9\x82\xE7\x8CĂ?\xEA\x82\xE9 SSH_notify_disconnecting() \x82?\x86\x82\xC5
+		// SSH2_MSG_CHANNEL_CLOSE \x82\xAA\x91\x97\x90M\x82\xB3\x82\xEA\x82\xE9\x82??C\x82\xB9\x82\xE9\x81B
+		// \x83N\x83\x89\x83C\x83A\x83\x93\x83g\x82\xA9\x82\xE7 SSH2_MSG_DISCONNECT \x82?\xE7\x82?\xAD\x82Ă\xE0\x81A\x82\xB7\x82?Ă\xCC CHANNEL \x82\xAA\x95?\xB6\x82\xEA\x82\xCE
+		// \x83T\x81[\x83o\x82\xA9\x82\xE7 SSH2_MSG_DISCONNECT \x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAD\x82邱\x82?\xF0\x8A\xFA\x91?\xB7\x82\xE9\x81B
+		/*
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
@@ -8574,6 +8579,7 @@
 		buffer_free(msg);
 
 		notify_verbose_message(pvar, "SSH2_MSG_DISCONNECT was sent at handle_SSH2_channel_close().", LOG_LEVEL_VERBOSE);
+		*/
 
 		// TCP connection closed
 		notify_closed_connection(pvar);

From svnnotify ＠ sourceforge.jp  Thu Oct  2 01:40:55 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 02 Oct 2014 01:40:55 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2NzNdICDjgIzjg5fjg6zjgqTjg7Pjg4Y=?=
 =?utf-8?b?44Kt44K544OI44CN44Gv6Kiz44Go44GX44Gm44GK44GL44GX44GE44Gu44Gn?=
 =?utf-8?b?44CM44OX44Os44Kk44Oz44OR44K544Ov44O844OJ44CN44Gr5L+u5q2j?=
Message-ID: <1412181655.952244.2948.nullmailer@users.sourceforge.jp>

Revision: 5673
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5673
Author:   maya
Date:     2014-10-02 01:40:55 +0900 (Thu, 02 Oct 2014)
Log Message:
-----------
「プレインテキスト」は訳としておかしいので「プレインパスワード」に修正

Modified Paths:
--------------
    trunk/installer/release/lang/Japanese.lng

-------------- next part --------------
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2014-10-01 05:52:38 UTC (rev 5672)
+++ trunk/installer/release/lang/Japanese.lng	2014-10-01 16:40:55 UTC (rev 5673)
@@ -528,7 +528,7 @@
 DLG_AUTH_PASSWORD=\x83p\x83X\x83t\x83\x8C\x81[\x83Y(&P):
 DLG_AUTH_REMEMBER_PASSWORD=\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x83\x81\x83\x82\x83\x8A\x8F\xE3\x82?L\x89\xAF\x82\xB7\x82\xE9(&M)
 DLG_AUTH_FWDAGENT=\x83G\x81[\x83W\x83F\x83\x93\x83g\x93]\x91\x97\x82\xB7\x82\xE9(&O)
-DLG_AUTH_METHOD_PASSWORD=\x83v\x83\x8C\x83C\x83\x93\x83e\x83L\x83X\x83g\x82\xF0\x8Eg\x82\xA4(&L)
+DLG_AUTH_METHOD_PASSWORD=\x83v\x83\x8C\x83C\x83\x93\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x8Eg\x82\xA4(&L)
 DLG_AUTH_METHOD_RSA=&RSA/DSA/ECDSA/ED25519\x8C\xAE\x82\xF0\x8Eg\x82\xA4
 DLG_AUTH_METHOD_RHOST=r&hosts(SSH1)\x82\xF0\x8Eg\x82\xA4
 DLG_AUTH_METHOD_CHALLENGE1=\x83`\x83\x83\x83\x8C\x83\x93\x83W\x83\x8C\x83X\x83|\x83\x93\x83X\x94F\x8F?\xF0\x8Eg\x82\xA4(&TIS)
@@ -544,7 +544,7 @@
 DLG_AUTHSETUP_TITLE=TTSSH: \x94F\x8F??\xE8
 DLG_AUTHSETUP_BANNER=\x92?\xED\x8Eg\x97p\x82\xB7\x82\xE9\x94F\x8F?\xFB\x8E\xAE:
 DLG_AUTHSETUP_USERNAME=\x83\x86\x81[\x83U\x96\xBC(&N):
-DLG_AUTHSETUP_METHOD_PASSWORD=\x83v\x83\x8C\x83C\x83\x93\x83e\x83L\x83X\x83g\x82\xF0\x8Eg\x82\xA4(&L)
+DLG_AUTHSETUP_METHOD_PASSWORD=\x83v\x83\x8C\x83C\x83\x93\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x8Eg\x82\xA4(&L)
 DLG_AUTHSETUP_METHOD_RSA=&RSA/DSA/ECDSA/ED25519\x8C\xAE\x82\xF0\x8Eg\x82\xA4
 DLG_AUTHSETUP_METHOD_RHOST=r&hosts\x82\xF0\x8Eg\x82\xA4(SSH1)
 DLG_AUTHSETUP_METHOD_CHALLENGE=\x83`\x83\x83\x83\x8C\x83\x93\x83W\x83\x8C\x83X\x83|\x83\x93\x83X\x94F\x8F?\xF0\x8Eg\x82\xA4(SSH1:TIS, SSH2:\x83L\x81[\x83{\x81[\x83h\x83C\x83\x93\x83^\x83\x89\x83N\x83e\x83B\x83u)(&T)

From svnnotify ＠ sourceforge.jp  Thu Oct  2 02:23:46 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 02 Oct 2014 02:23:46 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B5674=5D__plain_password_=E3=81=AB?=
 =?utf-8?b?44Gk44GE44Gm6Kqs5piO44KS6L+95Yqg?=
Message-ID: <1412184226.383509.19813.nullmailer@users.sourceforge.jp>

Revision: 5674
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5674
Author:   maya
Date:     2014-10-02 02:23:45 +0900 (Thu, 02 Oct 2014)
Log Message:
-----------
plain password について説明を追加

Modified Paths:
--------------
    trunk/doc/en/html/usage/ssh.html
    trunk/doc/ja/html/usage/ssh.html

-------------- next part --------------
Modified: trunk/doc/en/html/usage/ssh.html
===================================================================
--- trunk/doc/en/html/usage/ssh.html	2014-10-01 16:40:55 UTC (rev 5673)
+++ trunk/doc/en/html/usage/ssh.html	2014-10-01 17:23:45 UTC (rev 5674)
@@ -56,7 +56,8 @@
       For example, the OpenSSH client will be able to login to the server without regard to the difference the password and the keyboard-interactive authentication. However, the TTSSH can not login to the server with the keyboard-interactive and public key authentication by using the password authentication.
     </p>
     <ul>
-      <li>If you want to use Password authentication, then make sure that [Use plain password to log in] is chcked and type in username and password. If they are correct, you can login.</li>
+      <li>If you want to use Password authentication, then make sure that [Use plain password to log in] is chcked and type in username and password. If they are correct, you can login.<!--<br>
+          \x81\xA6\x83p\x83X\x83\x8F\x81[\x83h\x91\x97\x90M\x8E\x9E\x82\xCC SSH \x83p\x83P\x83b\x83g\x82?Í\x86\x89\xBB\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x82?ŁATELNET \x82?悤\x82?p\x83X\x83\x8F\x81[\x83h\x82\xAA\x95\xBD\x95\xB6\x82ő\x97\x90M\x82\xB3\x82\xEA\x82邱\x82??\xA0\x82\xE8\x82?\xB9\x82\xF1\x81B--></li>
       <li>When using public key authentication, check [RSA/DSA/ECDSA/ED25519 key to log in] (second from the top line) and click [Private key file:] to specify Private key file. Then type in username and Private key pass phrase.<br>
           Note: The passphrase can include the control character(0x01 - 0x1F).<br />
           Note: TTSSH 2.63(Tera Term 4.76) later can support the PuTTY format and SECSH(ssh.com) format of the SSH2 private key.</li>

Modified: trunk/doc/ja/html/usage/ssh.html
===================================================================
--- trunk/doc/ja/html/usage/ssh.html	2014-10-01 16:40:55 UTC (rev 5673)
+++ trunk/doc/ja/html/usage/ssh.html	2014-10-01 17:23:45 UTC (rev 5674)
@@ -55,7 +55,8 @@
       \x82\xBD\x82?\xA6\x82\xCE OpenSSH \x83N\x83\x89\x83C\x83A\x83\x93\x83g\x82ł?p\x83X\x83\x8F\x81[\x83h\x94F\x8F?\xC6 keyboard-interactive \x94F\x8F??\xA9\x82\xBD\x96?\xAA\x82\xBB\x82\xA4\x95ς\xED\x82\xE7\x82?\xA2\x82\xBD\x82?T\x81[\x83o\x82?F\x8F?\xFB\x8E\xAE\x82\xF0\x88?\xAF\x82\xB9\x82\xB8\x82?\x8D\x83O\x83C\x83\x93\x82ł\xAB\x82?\xB7\x82\xAA\x81ATTSSH \x82?\xBB\x82\xA4\x82ł?\xA0\x82\xE8\x82?\xB9\x82\xF1\x81Bkeyboard-interactive \x94F\x8F??\xF6\x8AJ\x8C\xAE\x94F\x8F?\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA2\x82\xE9\x83T\x81[\x83o\x82?p\x83X\x83\x8F\x81[\x83h\x94F\x8F?Ń\x8D\x83O\x83C\x83\x93\x82\xB5\x82悤\x82?\xB5\x82Ă\xE0\x95K\x82\xB8\x8E\xB8\x94s\x82\xB5\x82?\xB7\x81B
     </p>
     <ul>
-      <li>\x83p\x83X\x83\x8F\x81[\x83h\x94F\x8F?\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x8F?\x82?uUse plain password to log in\x81v\x82?`\x83F\x83b\x83N\x82\xAA\x82?\xA2\x82Ă\xA2\x82邱\x82?\xF0\x8Am\x94F\x82\xB5\x81A\x83\x86\x81[\x83U\x96\xBC\x82?p\x83X\x83\x8F\x81[\x83h\x82\xF0\x93\xFC\x97?\xB5\x82?\xB7\x81B\x82\xB1\x82\xEA\x82?\x90\xB3\x82\xB5\x82\xAF\x82\xEA\x82Ζ\xB3\x8E\x96\x83\x8D\x83O\x83C\x83\x93\x82ł\xAB\x82?\xB7\x81B</li>
+      <li>\x83p\x83X\x83\x8F\x81[\x83h\x94F\x8F?\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x8F?\x82?uUse plain password to log in\x81v\x82?`\x83F\x83b\x83N\x82\xAA\x82?\xA2\x82Ă\xA2\x82邱\x82?\xF0\x8Am\x94F\x82\xB5\x81A\x83\x86\x81[\x83U\x96\xBC\x82?p\x83X\x83\x8F\x81[\x83h\x82\xF0\x93\xFC\x97?\xB5\x82?\xB7\x81B\x82\xB1\x82\xEA\x82?\x90\xB3\x82\xB5\x82\xAF\x82\xEA\x82Ζ\xB3\x8E\x96\x83\x8D\x83O\x83C\x83\x93\x82ł\xAB\x82?\xB7\x81B<br>
+          \x81\xA6\x83p\x83X\x83\x8F\x81[\x83h\x91\x97\x90M\x8E\x9E\x82\xCC SSH \x83p\x83P\x83b\x83g\x82?Í\x86\x89\xBB\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x82?ŁATELNET \x82?悤\x82?p\x83X\x83\x8F\x81[\x83h\x82\xAA\x95\xBD\x95\xB6\x82ő\x97\x90M\x82\xB3\x82\xEA\x82邱\x82??\xA0\x82\xE8\x82?\xB9\x82\xF1\x81B</li>
       <li>\x8C\xF6\x8AJ\x8C\xAE\x94F\x8F?\xF0\x97p\x82\xA2\x82\xE9\x8F?\x82?A\x8Fォ\x82\xE72\x94???uUse RSA/DSA/ECDSA/ED25519 key to log in\x81v\x82?`\x83F\x83b\x83N\x82\xF0\x82?\xAF\x81A\x81uPrivate key file:\x81v\x83{\x83^\x83\x93\x82\xF0\x89\x9F\x82\xB5\x82?閧\x83L\x81[\x82?t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92?\x82?\xB7\x81B\x82\xBB\x82?テ\x81[\x83U\x96\xBC\x82?閧\x83L\x81[\x82?p\x83X\x83t\x83\x8C\x81[\x83Y\x82\xF0\x93\xFC\x97?\xB5\x82ă\x8D\x83O\x83C\x83\x93\x82\xB5\x82?\xB7\x81B<br>
           \x81\xA6\x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82??\xA7\x8C?\x8E\x9A(0x01 - 0x1F)\x82\xF0\x93\xFC\x97?\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B<br />
           \x81\xA6OpenSSH \x8C`\x8E\xAE\x82??\xA9\x81ATTSSH 2.63(Tera Term 4.76) \x88?~\x82ł\xCD PuTTY \x8C`\x8E\xAE\x81ESECSH(ssh.com) \x8C`\x8E\xAE\x82\xCC SSH2 \x94閧\x8C\xAE\x82?Ή\x9E\x82\xB5\x82Ă\xA2\x82?\xB7\x81B</li>

From svnnotify ＠ sourceforge.jp  Thu Oct  2 02:49:35 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 02 Oct 2014 02:49:35 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2NzVdICDjgrPjg7Pjg4jjg63jg7zjg6s=?=
 =?utf-8?b?44Gu6YWN572u44KS6Kq/5pW0?=
Message-ID: <1412185775.056074.3913.nullmailer@users.sourceforge.jp>

Revision: 5675
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5675
Author:   maya
Date:     2014-10-02 02:49:34 +0900 (Thu, 02 Oct 2014)
Log Message:
-----------
コントロールの配置を調整

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttermpro.rc

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2014-10-01 17:23:45 UTC (rev 5674)
+++ trunk/teraterm/teraterm/ttermpro.rc	2014-10-01 17:49:34 UTC (rev 5675)
@@ -157,20 +157,20 @@
     EDITTEXT        IDC_DEFAULTPATH_EDITOR,11,83,120,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_DEFAULTPATH_PUSH,135,84,13,10
     CONTROL         "A&uto start logging",IDC_AUTOSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,102,124,10
+    GROUPBOX        "Log option",IDC_LOG_OPTION_GROUP,157,10,95,98
+    CONTROL         "Binary",IDC_OPT_BINARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,24,86,10
+    CONTROL         "Append",IDC_OPT_APPEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,38,86,10
+    CONTROL         "Plain text",IDC_OPT_PLAINTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,52,86,10
+    CONTROL         "Timestamp",IDC_OPT_TIMESTAMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,66,86,10
+    CONTROL         "Hide dialog",IDC_OPT_HIDEDLG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,80,86,10
+    CONTROL         "Include screen buffer",IDC_OPT_INCBUF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,94,86,10
+    GROUPBOX        "",IDC_ROTATE_GROUP,19,112,214,39
     CONTROL         "Log Rotate",IDC_LOG_ROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,26,120,127,10
-    EDITTEXT        IDC_ROTATE_SIZE,61,134,46,14,ES_AUTOHSCROLL
+    LTEXT           "Size",IDC_ROTATE_SIZE_TEXT,27,137,28,8
+    EDITTEXT        IDC_ROTATE_SIZE,61,135,46,12,ES_AUTOHSCROLL
     COMBOBOX        IDC_ROTATE_SIZE_TYPE,112,135,31,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_ROTATE_STEP,195,134,30,14,ES_AUTOHSCROLL
     LTEXT           "Rotate",IDC_ROTATE_STEP_TEXT,165,138,27,8
-    LTEXT           "Size",IDC_ROTATE_SIZE_TEXT,27,137,28,8
-    GROUPBOX        "",IDC_ROTATE_GROUP,19,112,214,39
-    GROUPBOX        "Log option",IDC_LOG_OPTION_GROUP,157,10,95,91
-    CONTROL         "Binary",IDC_OPT_BINARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,24,86,10
-    CONTROL         "Append",IDC_OPT_APPEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,38,86,10
-    CONTROL         "Plain text",IDC_OPT_PLAINTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,51,86,10
-    CONTROL         "Timestamp",IDC_OPT_TIMESTAMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,64,86,10
-    CONTROL         "Hide dialog",IDC_OPT_HIDEDLG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,76,86,10
-    CONTROL         "Include screen buffer",IDC_OPT_INCBUF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,88,86,10
+    EDITTEXT        IDC_ROTATE_STEP,195,135,30,12,ES_AUTOHSCROLL
 END
 
 IDD_TABSHEET_CYGWIN DIALOGEX 0, 0, 258, 158

From svnnotify ＠ sourceforge.jp  Thu Oct  2 23:43:01 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 02 Oct 2014 23:43:01 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2NzZdICDoi7HoqLM=?=
Message-ID: <1412260981.428280.28967.nullmailer@users.sourceforge.jp>

Revision: 5676
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5676
Author:   yutakapon
Date:     2014-10-02 23:42:59 +0900 (Thu, 02 Oct 2014)
Log Message:
-----------
英訳

Modified Paths:
--------------
    trunk/doc/en/html/usage/ssh.html

-------------- next part --------------
Modified: trunk/doc/en/html/usage/ssh.html
===================================================================
--- trunk/doc/en/html/usage/ssh.html	2014-10-01 17:49:34 UTC (rev 5675)
+++ trunk/doc/en/html/usage/ssh.html	2014-10-02 14:42:59 UTC (rev 5676)
@@ -56,8 +56,8 @@
       For example, the OpenSSH client will be able to login to the server without regard to the difference the password and the keyboard-interactive authentication. However, the TTSSH can not login to the server with the keyboard-interactive and public key authentication by using the password authentication.
     </p>
     <ul>
-      <li>If you want to use Password authentication, then make sure that [Use plain password to log in] is chcked and type in username and password. If they are correct, you can login.<!--<br>
-          \x81\xA6\x83p\x83X\x83\x8F\x81[\x83h\x91\x97\x90M\x8E\x9E\x82\xCC SSH \x83p\x83P\x83b\x83g\x82?Í\x86\x89\xBB\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x82?ŁATELNET \x82?悤\x82?p\x83X\x83\x8F\x81[\x83h\x82\xAA\x95\xBD\x95\xB6\x82ő\x97\x90M\x82\xB3\x82\xEA\x82邱\x82??\xA0\x82\xE8\x82?\xB9\x82\xF1\x81B--></li>
+      <li>If you want to use Password authentication, then make sure that [Use plain password to log in] is chcked and type in username and password. If they are correct, you can login.<br>
+          NOTE: The password can not be sent as plain text like TELNET protocol because the SSH packet including the password data is encrypted.</li>
       <li>When using public key authentication, check [RSA/DSA/ECDSA/ED25519 key to log in] (second from the top line) and click [Private key file:] to specify Private key file. Then type in username and Private key pass phrase.<br>
           Note: The passphrase can include the control character(0x01 - 0x1F).<br />
           Note: TTSSH 2.63(Tera Term 4.76) later can support the PuTTY format and SECSH(ssh.com) format of the SSH2 private key.</li>

From svnnotify ＠ sourceforge.jp  Fri Oct  3 23:32:32 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 03 Oct 2014 23:32:32 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2NzddICDjgrPjg7Pjg4jjg63jg7zjg6s=?=
 =?utf-8?b?44Gu6YWN572u44KS6Kq/5pW0?=
Message-ID: <1412346752.578282.22990.nullmailer@users.sourceforge.jp>

Revision: 5677
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5677
Author:   maya
Date:     2014-10-03 23:32:29 +0900 (Fri, 03 Oct 2014)
Log Message:
-----------
コントロールの配置を調整

Modified Paths:
--------------
    trunk/teraterm/ttpdlg/ttpdlg.rc

-------------- next part --------------
Modified: trunk/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.rc	2014-10-02 14:42:59 UTC (rev 5676)
+++ trunk/teraterm/ttpdlg/ttpdlg.rc	2014-10-03 14:32:29 UTC (rev 5677)
@@ -251,20 +251,20 @@
     LTEXT           "Build time: ",IDC_BUILDTIME,7,97,165,8
 END
 
-IDD_GENDLG DIALOGEX 20, 20, 142, 80
+IDD_GENDLG DIALOGEX 20, 20, 162, 80
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Tera Term: General setup"
 FONT 14, "System", 0, 0, 0x0
 BEGIN
     CONTROL         "Default &port:",IDC_GENPORT_LABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,14,10,57,11
-    COMBOBOX        IDC_GENPORT,76,9,52,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_GENPORT,96,9,52,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     LTEXT           "&Language:",IDC_GENLANGLABEL,14,26,39,11,NOT WS_VISIBLE
-    COMBOBOX        IDC_GENLANG,58,25,70,45,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_GENLANG,78,25,70,45,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Language&UI:",IDC_GENLANGUI_LABEL,14,42,44,8
+    COMBOBOX        IDC_GENLANG_UI,58,41,90,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON   "OK",IDOK,13,61,32,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,50,61,40,14
-    PUSHBUTTON      "&Help",IDC_GENHELP,95,61,36,14
-    LTEXT           "Language&UI:",IDC_GENLANGUI_LABEL,14,44,44,8
-    COMBOBOX        IDC_GENLANG_UI,58,42,71,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Cancel",IDCANCEL,60,61,40,14
+    PUSHBUTTON      "&Help",IDC_GENHELP,115,61,36,14
 END
 
 IDD_TERMDLG DIALOGEX 20, 20, 245, 100
@@ -426,7 +426,7 @@
 
     IDD_GENDLG, DIALOG
     BEGIN
-        BOTTOMMARGIN, 65
+        BOTTOMMARGIN, 75
     END
 
     IDD_WINDLG, DIALOG

From svnnotify ＠ sourceforge.jp  Sat Oct  4 12:39:29 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 04 Oct 2014 12:39:29 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2NzhdICBTU0gyIOWIh+aWreOCt+ODvA==?=
 =?utf-8?b?44Kx44Oz44K544Gu6Kq/5pW0?=
Message-ID: <1412393969.122574.1270.nullmailer@users.sourceforge.jp>

Revision: 5678
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5678
Author:   maya
Date:     2014-10-04 12:39:24 +0900 (Sat, 04 Oct 2014)
Log Message:
-----------
SSH2 切断シーケンスの調整
・shell のチャネルが MSG_CHANNEL_CLOSE を受け取ったとき
  MSG_DISCONNECT を送り、MSG_CHANNEL_CLOSE を送り、socket を切断する
  ↓
  MSG_CHANNEL_CLOSE を送り、MSG_DISCONNECT を送り、socket を切断する
・認証中にユーザがキャンセルしたとき
  MSG_CHANNEL_CLOSE を送り、socket を切断する
  ↓
  MSG_DISCONNECT を送り、socket を切断する
・MSG_DISCONNECT を受け取ったとき
  MSG_CHANNEL_CLOSE を送り、socket を切断する
    ↓
  socket を切断する

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/auth.c
    trunk/ttssh2/ttxssh/crypt.c
    trunk/ttssh2/ttxssh/hosts.c
    trunk/ttssh2/ttxssh/kex.c
    trunk/ttssh2/ttxssh/pkt.c
    trunk/ttssh2/ttxssh/ssh.c
    trunk/ttssh2/ttxssh/ttxssh.c
    trunk/ttssh2/ttxssh/ttxssh.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c	2014-10-03 14:32:29 UTC (rev 5677)
+++ trunk/ttssh2/ttxssh/auth.c	2014-10-04 03:39:24 UTC (rev 5678)
@@ -866,7 +866,7 @@
 		case IDCANCEL:			/* kill the connection */
 canceled:
 			pvar->auth_state.auth_dialog = NULL;
-			notify_closed_connection(pvar);
+			notify_closed_connection(pvar, "authentication cancelled");
 			EndDialog(dlg, 0);
 
 			if (DlgAuthFont != NULL) {
@@ -969,7 +969,7 @@
 		UTIL_get_lang_msg("MSG_NOAUTHMETHOD_ERROR", pvar,
 		                  "Server does not support any of the authentication options\n"
 		                  "provided by TTSSH. This connection will now close.");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		return 0;
 	} else {
 		if (pvar->auth_state.auth_dialog != NULL) {
@@ -1189,7 +1189,7 @@
 
 		case IDCANCEL:			/* kill the connection */
 			pvar->auth_state.auth_dialog = NULL;
-			notify_closed_connection(pvar);
+			notify_closed_connection(pvar, "authentication cancelled");
 			EndDialog(dlg, 0);
 
 			if (DlgTisFont != NULL) {
@@ -1232,7 +1232,7 @@
 			UTIL_get_lang_msg("MSG_CREATEWINDOW_AUTH_ERROR", pvar,
 			                  "Unable to display authentication dialog box.\n"
 			                  "Connection terminated.");
-			notify_fatal_error(pvar, pvar->ts->UIMsg);
+			notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		}
 	}
 }

Modified: trunk/ttssh2/ttxssh/crypt.c
===================================================================
--- trunk/ttssh2/ttxssh/crypt.c	2014-10-03 14:32:29 UTC (rev 5677)
+++ trunk/ttssh2/ttxssh/crypt.c	2014-10-04 03:39:24 UTC (rev 5678)
@@ -235,7 +235,7 @@
 		                  "%s encrypt error(1): bytes %d (%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "AES128/192/256", bytes, block_size);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 	}
 
@@ -243,7 +243,7 @@
 		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "AES128/192/256");
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 
 	} else {
@@ -283,7 +283,7 @@
 		                  "%s decrypt error(1): bytes %d (%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "AES128/192/256", bytes, block_size);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 	}
 
@@ -291,7 +291,7 @@
 		UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "AES128/192/256");
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 
 	} else {
@@ -333,7 +333,7 @@
 		                  "%s encrypt error(1): bytes %d (%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "3DES-CBC", bytes, block_size);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 	}
 
@@ -341,7 +341,7 @@
 		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "3DES-CBC");
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 
 	} else {
@@ -381,7 +381,7 @@
 		                  "%s decrypt error(1): bytes %d (%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "3DES-CBC", bytes, block_size);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 	}
 
@@ -389,7 +389,7 @@
 		UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "3DES-CBC");
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 
 	} else {
@@ -430,7 +430,7 @@
 		                  "%s encrypt error(1): bytes %d (%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "Blowfish", bytes, block_size);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 	}
 
@@ -438,7 +438,7 @@
 		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "Blowfish");
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 
 	} else {
@@ -469,7 +469,7 @@
 		                  "%s decrypt error(1): bytes %d (%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "Blowfish", bytes, block_size);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 	}
 
@@ -477,7 +477,7 @@
 		UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "Blowfish");
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 
 	} else {
@@ -509,7 +509,7 @@
 		                  "%s encrypt error(1): bytes %d (%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "Arcfour", bytes, block_size);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 	}
 
@@ -517,7 +517,7 @@
 		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "Arcfour");
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 
 	} else {
@@ -548,7 +548,7 @@
 		                  "%s decrypt error(1): bytes %d (%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "Arcfour", bytes, block_size);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 	}
 
@@ -556,7 +556,7 @@
 		UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "Arcfour");
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 
 	} else {
@@ -588,7 +588,7 @@
 		                  "%s encrypt error(1): bytes %d (%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "CAST128", bytes, block_size);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 	}
 
@@ -596,7 +596,7 @@
 		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "CAST128");
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 
 	} else {
@@ -627,7 +627,7 @@
 		                  "%s decrypt error(1): bytes %d (%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "CAST128", bytes, block_size);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 	}
 
@@ -635,7 +635,7 @@
 		UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "CAST128");
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 
 	} else {
@@ -666,7 +666,7 @@
 		                  "%s encrypt error(1): bytes %d (%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "Camellia128/192/256", bytes, block_size);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 	}
 
@@ -674,7 +674,7 @@
 		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "Camellia128/192/256");
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 
 	} else {
@@ -705,7 +705,7 @@
 		                  "%s decrypt error(1): bytes %d (%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "Camellia128/192/256", bytes, block_size);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 	}
 
@@ -713,7 +713,7 @@
 		UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            "Camellia128/192/256");
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		goto error;
 
 	} else {
@@ -881,7 +881,7 @@
 	if (key == NULL || key->e == NULL || key->n == NULL) {
 		UTIL_get_lang_msg("MSG_RSAKEY_SETUP_ERROR", pvar,
 		                  "Error setting up RSA keys");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 
 		if (key != NULL) {
 			if (key->e != NULL) {
@@ -981,14 +981,14 @@
 		                  "The server does not support any of the TTSSH encryption algorithms.\n"
 		                  "A secure connection cannot be made in the TTSSH-to-server direction.\n"
 		                  "The connection will be closed.");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		return FALSE;
 	} else if (receiver_ciphers == 0) {
 		UTIL_get_lang_msg("MSG_UNAVAILABLE_CIPHERS_ERROR", pvar,
 		                  "The server does not support any of the TTSSH encryption algorithms.\n"
 		                  "A secure connection cannot be made in the TTSSH-to-server direction.\n"
 		                  "The connection will be closed.");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		return FALSE;
 	} else {
 		return TRUE;
@@ -1160,7 +1160,7 @@
 		                  "To communicate with this server, you will have to enable some more ciphers\n"
 		                  "in the TTSSH Setup dialog box when you run Tera Term again.\n"
 		                  "This connection will now close.");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		return FALSE;
 	} else {
 		return TRUE;
@@ -1204,7 +1204,7 @@
 	if (bit_delta < 128 || server_key_bits < 512 || host_key_bits < 512) {
 		UTIL_get_lang_msg("MSG_RASKEY_TOOWEAK_ERROR", pvar,
 		                  "Server RSA keys are too weak. A secure connection cannot be established.");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		return 0;
 	} else {
 		/* following Goldberg's code, I'm using MD5(servkey->n || hostkey->n || cookie)
@@ -1381,7 +1381,7 @@
 		UTIL_get_lang_msg("MSG_CIPHER_INIT_ERROR", pvar,
 		                  "Cipher initialize error(%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg, 1);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		return;
 	}
 
@@ -1391,7 +1391,7 @@
 			UTIL_get_lang_msg("MSG_CIPHER_INIT_ERROR", pvar,
 			                  "Cipher initialize error(%d)");
 			_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg, 2);
-			notify_fatal_error(pvar, tmp);
+			notify_fatal_error(pvar, tmp, TRUE);
 			return;
 		}
 	}
@@ -1399,7 +1399,7 @@
 		UTIL_get_lang_msg("MSG_CIPHER_INIT_ERROR", pvar,
 		                  "Cipher initialize error(%d)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg, 3);
-		notify_fatal_error(pvar, tmp);
+		notify_fatal_error(pvar, tmp, TRUE);
 		return;
 	}
 
@@ -1412,7 +1412,7 @@
 			                  "Cipher initialize error(%d)");
 			_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
 			            pvar->ts->UIMsg, 3);
-			notify_fatal_error(pvar, tmp);
+			notify_fatal_error(pvar, tmp, TRUE);
 		}
 		else {
 			memset(discard, 0, discard_len);
@@ -1781,7 +1781,7 @@
 	if (!isOK) {
 		UTIL_get_lang_msg("MSG_CHPHER_NOTSELECTED_ERROR", pvar,
 		                  "No cipher selected!");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		return FALSE;
 	} else {
 		memset(encryption_key, 0, CRYPT_KEY_LENGTH);

Modified: trunk/ttssh2/ttxssh/hosts.c
===================================================================
--- trunk/ttssh2/ttxssh/hosts.c	2014-10-03 14:32:29 UTC (rev 5677)
+++ trunk/ttssh2/ttxssh/hosts.c	2014-10-04 03:39:24 UTC (rev 5678)
@@ -676,7 +676,7 @@
 				UTIL_get_lang_msg("MSG_HOSTS_HOSTNAME_INVALID_ERROR", pvar,
 				                  "The host name contains an invalid character.\n"
 				                  "This session will be terminated.");
-				notify_fatal_error(pvar, pvar->ts->UIMsg);
+				notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 			}
 			return 0;
 		}
@@ -687,7 +687,7 @@
 			UTIL_get_lang_msg("MSG_HOSTS_HOSTNAME_EMPTY_ERROR", pvar,
 			                  "The host name should not be empty.\n"
 			                  "This session will be terminated.");
-			notify_fatal_error(pvar, pvar->ts->UIMsg);
+			notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		}
 		return 0;
 	}
@@ -1423,7 +1423,7 @@
 		case IDCANCEL:			/* kill the connection */
 canceled:
 			pvar->hosts_state.hosts_dialog = NULL;
-			notify_closed_connection(pvar);
+			notify_closed_connection(pvar, "authentication cancelled");
 			EndDialog(dlg, 0);
 
 			if (DlgHostsAddFont != NULL) {
@@ -1573,7 +1573,7 @@
 		case IDCANCEL:			/* kill the connection */
 canceled:
 			pvar->hosts_state.hosts_dialog = NULL;
-			notify_closed_connection(pvar);
+			notify_closed_connection(pvar, "authentication cancelled");
 			EndDialog(dlg, 0);
 
 			if (DlgHostsReplaceFont != NULL) {
@@ -1725,7 +1725,7 @@
 		case IDCANCEL:			/* kill the connection */
 canceled:
 			pvar->hosts_state.hosts_dialog = NULL;
-			notify_closed_connection(pvar);
+			notify_closed_connection(pvar, "authentication cancelled");
 			EndDialog(dlg, 0);
 
 			if (DlgHostsAddFont != NULL) {

Modified: trunk/ttssh2/ttxssh/kex.c
===================================================================
--- trunk/ttssh2/ttxssh/kex.c	2014-10-03 14:32:29 UTC (rev 5677)
+++ trunk/ttssh2/ttxssh/kex.c	2014-10-04 03:39:24 UTC (rev 5678)
@@ -120,7 +120,7 @@
 	return;
 
 error:;
-	notify_fatal_error(pvar, "error occurred @ dh_gen_key()");
+	notify_fatal_error(pvar, "error occurred @ dh_gen_key()", TRUE);
 
 }
 

Modified: trunk/ttssh2/ttxssh/pkt.c
===================================================================
--- trunk/ttssh2/ttxssh/pkt.c	2014-10-03 14:32:29 UTC (rev 5677)
+++ trunk/ttssh2/ttxssh/pkt.c	2014-10-04 03:39:24 UTC (rev 5678)
@@ -246,7 +246,7 @@
 				// \x8E\xC0\x8D???f\x81[\x83^\x89\xBB\x82\xAF\x82ŕ\x9C\x8D\x86\x8E\xB8\x94s\x8E\x9E\x82?A\x8C\xEB\x94F\x8E\xAF\x82\xB7\x82邱\x82?\xAA\x91\xBD\x82\xA2\x81B
 				UTIL_get_lang_msg("MSG_PKT_OVERSIZED_ERROR", pvar,
 				                  "Oversized packet received from server; connection will close.");
-				notify_fatal_error(pvar, pvar->ts->UIMsg);
+				notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 			} else {
 				int amount_read =
 					recv_data(pvar, max(total_packet_size, READAMOUNT));

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2014-10-03 14:32:29 UTC (rev 5677)
+++ trunk/ttssh2/ttxssh/ssh.c	2014-10-04 03:39:24 UTC (rev 5678)
@@ -614,7 +614,7 @@
 			default:
 				UTIL_get_lang_msg("MSG_SSH_INVALID_COMPDATA_ERROR", pvar,
 				                  "Invalid compressed data in received packet");
-				notify_fatal_error(pvar, pvar->ts->UIMsg);
+				notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 				return -1;
 			}
 		}
@@ -646,7 +646,7 @@
 			                  "Received truncated packet (%ld > %d) @ grab_payload()");
 			_snprintf_s(buf, sizeof(buf), _TRUNCATE, pvar->ts->UIMsg,
 			            pvar->ssh_state.payload_grabbed, in_buffer);
-			notify_fatal_error(pvar, buf);
+			notify_fatal_error(pvar, buf, TRUE);
 			return FALSE;
 		} else {
 			return TRUE;
@@ -670,7 +670,7 @@
 			                  "Received truncated packet (%ld > %d) @ grab_payload_limited()");
 			_snprintf_s(buf, sizeof(buf), _TRUNCATE, pvar->ts->UIMsg,
 			            pvar->ssh_state.payload_grabbed, in_buffer);
-			notify_fatal_error(pvar, buf);
+			notify_fatal_error(pvar, buf, TRUE);
 			return FALSE;
 		} else {
 			return TRUE;
@@ -696,7 +696,7 @@
 		if (CRYPT_detect_attack(pvar, pvar->ssh_state.payload, len)) {
 			UTIL_get_lang_msg("MSG_SSH_COREINS_ERROR", pvar,
 			                  "'CORE insertion attack' detected.  Aborting connection.");
-			notify_fatal_error(pvar, pvar->ts->UIMsg);
+			notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		}
 
 		CRYPT_decrypt(pvar, pvar->ssh_state.payload, len);
@@ -705,7 +705,7 @@
 			get_uint32_MSBfirst(pvar->ssh_state.payload + len - 4)) {
 			UTIL_get_lang_msg("MSG_SSH_CORRUPTDATA_ERROR", pvar,
 			                  "Detected corrupted data; connection terminating.");
-			notify_fatal_error(pvar, pvar->ts->UIMsg);
+			notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 			return SSH_MSG_NONE;
 		}
 
@@ -727,7 +727,7 @@
 			 data + len + 4)) {
 			UTIL_get_lang_msg("MSG_SSH_CORRUPTDATA_ERROR", pvar,
 			                  "Detected corrupted data; connection terminating.");
-			notify_fatal_error(pvar, pvar->ts->UIMsg);
+			notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 			return SSH_MSG_NONE;
 		}
 
@@ -890,7 +890,7 @@
 		UTIL_get_lang_msg("MSG_SSH_SEND_PKT_ERROR", pvar,
 		                  "A communications error occurred while sending an SSH packet.\n"
 		                  "The connection will close.");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		return FALSE;
 	} else {
 		return TRUE;
@@ -928,7 +928,7 @@
 	                  "The connection will close. (%s:%d)");
 	_snprintf_s(buf, sizeof(buf), _TRUNCATE, pvar->ts->UIMsg,
 	            kind, code);
-	notify_fatal_error(pvar, buf);
+	notify_fatal_error(pvar, buf, TRUE);
 	return FALSE;
 #endif
 }
@@ -960,7 +960,7 @@
 				UTIL_get_lang_msg("MSG_SSH_COMP_ERROR", pvar,
 				                  "An error occurred while compressing packet data.\n"
 				                  "The connection will close.");
-				notify_fatal_error(pvar, pvar->ts->UIMsg);
+				notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 				return;
 			}
 		}
@@ -1025,7 +1025,7 @@
 				UTIL_get_lang_msg("MSG_SSH_COMP_ERROR", pvar,
 				                  "An error occurred while compressing packet data.\n"
 				                  "The connection will close.");
-				notify_fatal_error(pvar, pvar->ts->UIMsg);
+				notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 				return;
 			}
 			data = buffer_ptr(msg);
@@ -1421,8 +1421,16 @@
 		_snprintf_s(buf, sizeof(buf), _TRUNCATE,
 		            pvar->ts->UIMsg, explanation);
 	}
-	notify_fatal_error(pvar, buf);
 
+	if (SSHv2(pvar)) {
+		// SSH2_MSG_DISCONNECT \x82\xF0\x8E?\xE6\x82\xC1\x82\xBD\x82\xA0\x82??\xBD\x82\xE0\x91\x97\x90M\x82\xB5\x82Ă?\xA2\x82\xAF\x82?\xA2
+		notify_fatal_error(pvar, buf, FALSE);
+	}
+	else {
+		// SSH1 \x82??\x82?d\x97l\x82\xAA\x95\xAA\x82\xA9\x82\xE7\x82?\xA2\x82?ŁA\x88?O\x82????\xB5\x82Ă\xA8\x82\xAD
+		notify_fatal_error(pvar, buf, TRUE);
+	}
+
 	return TRUE;
 }
 
@@ -1724,19 +1732,19 @@
 			if (!parse_protocol_ID(pvar, ID)) {
 				UTIL_get_lang_msg("MSG_SSH_VERSION_ERROR", pvar,
 				                  "This program does not understand the server's version of the protocol.");
-				notify_fatal_error(pvar, pvar->ts->UIMsg);
+				notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 			}
 			else if ((negotiate = negotiate_protocol(pvar)) == 1) {
 				UTIL_get_lang_msg("MSG_SSH_VERSION_ERROR", pvar,
 				                  "This program does not understand the server's version of the protocol.");
-				notify_fatal_error(pvar, pvar->ts->UIMsg);
+				notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 			}
 			else if (negotiate == -1) {
 				UTIL_get_lang_msg("MSG_SSH_VERSION_MISMATCH", pvar,
 				                  "Protocol version mismatch. server:%d.%d client:%d");
 				_snprintf_s(uimsg, sizeof(uimsg), _TRUNCATE, pvar->ts->UIMsg,
 				            pvar->protocol_major, pvar->protocol_minor, pvar->settings.ssh_protocol_version);
-				notify_fatal_error(pvar, uimsg);
+				notify_fatal_error(pvar, uimsg, TRUE);
 			}
 			else {
 				char TTSSH_ID[1024];
@@ -1770,7 +1778,7 @@
 					UTIL_get_lang_msg("MSG_SSH_SEND_ID_ERROR", pvar,
 					                  "An error occurred while sending the SSH ID string.\n"
 					                  "The connection will close.");
-					notify_fatal_error(pvar, pvar->ts->UIMsg);
+					notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 				} else {
 					// \x89\xFC\x8Ds\x83R\x81[\x83h\x82?\x9C\x8B\x8E (2004.8.4 yutaka)
 					pvar->client_version_string[--TTSSH_ID_len] = 0; // \n
@@ -1807,7 +1815,7 @@
 	if (grab_payload(pvar, 4)) {
 		begin_send_packet(pvar, SSH_CMSG_EXIT_CONFIRMATION, 0);
 		finish_send_packet(pvar);
-		notify_closed_connection(pvar);
+		notify_closed_connection(pvar, "disconnected by server request");
 	}
 	return TRUE;
 }
@@ -2080,7 +2088,7 @@
 								  "Unexpected SSH2 message(%d) on current stage(%d)");
 				_snprintf_s(buf, sizeof(buf), _TRUNCATE,
 					pvar->ts->UIMsg, message, handle_message_stage);
-				notify_fatal_error(pvar, buf);
+				notify_fatal_error(pvar, buf, TRUE);
 				// abort
 			}
 		}
@@ -2093,7 +2101,7 @@
 				                  "Unexpected packet type received: %d");
 				_snprintf_s(buf, sizeof(buf), _TRUNCATE,
 					pvar->ts->UIMsg, message, handle_message_stage);
-				notify_fatal_error(pvar, buf);
+				notify_fatal_error(pvar, buf, TRUE);
 			} else {
 				unsigned char FAR *outmsg =
 					begin_send_packet(pvar, SSH2_MSG_UNIMPLEMENTED, 4);
@@ -2223,7 +2231,7 @@
 		UTIL_get_lang_msg("MSG_SSH_SETUP_COMP_ERROR", pvar,
 		                  "An error occurred while setting up compression.\n"
 		                  "The connection will close.");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		return;
 	} else {
 		// SSH2\x82ł?\xB3\x8Fk\x81E\x93W\x8AJ\x8F\x88\x97\x9D\x82\xF0SSH1\x82????s\x82\xA4\x82?ŁA\x89\xBA\x8BL\x83t\x83\x89\x83O\x82?\x8E\x82?\xB5\x82Ă\xA8\x82\xAD\x81B(2005.7.9 yutaka)
@@ -2252,7 +2260,7 @@
 		UTIL_get_lang_msg("MSG_SSH_SETUP_COMP_ERROR", pvar,
 		                  "An error occurred while setting up compression.\n"
 		                  "The connection will close.");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		return;
 	} else {
 		// SSH2\x82ł?\xB3\x8Fk\x81E\x93W\x8AJ\x8F\x88\x97\x9D\x82\xF0SSH1\x82????s\x82\xA4\x82?ŁA\x89\xBA\x8BL\x83t\x83\x89\x83O\x82?\x8E\x82?\xB5\x82Ă\xA8\x82\xAD\x81B(2005.7.9 yutaka)
@@ -2362,7 +2370,7 @@
 				UTIL_get_lang_msg("MSG_SSH_DECRYPT_RSA_ERROR", pvar,
 								  "An error occurred while decrypting the RSA challenge.\n"
 								  "Perhaps the key file is corrupted.");
-				notify_fatal_error(pvar, pvar->ts->UIMsg);
+				notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 			}
 		}
 		else if (pvar->auth_state.cur_cred.method == SSH_AUTH_PAGEANT) {
@@ -2580,7 +2588,7 @@
 		default:
 			UTIL_get_lang_msg("MSG_SSH_UNSUPPORT_AUTH_METHOD_ERROR", pvar,
 			                  "Internal error: unsupported authentication method");
-			notify_fatal_error(pvar, pvar->ts->UIMsg);
+			notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 			return;
 		}
 
@@ -2734,32 +2742,28 @@
 	} else { // for SSH2(yutaka)
 		buffer_t *msg;
 		unsigned char *outmsg;
+		char *s;
 		int len;
-		Channel_t *c;
 
-		c = ssh2_channel_lookup(pvar->shell_id);
-		if (c == NULL)
-			return;
-
-		// SSH2 server\x82\xC9channel close\x82\xF0\x93`\x82\xA6\x82\xE9
+		// SSH2 server\x82\xC9disconnect\x82\xF0\x93`\x82\xA6\x82\xE9
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
 			return;
 		}
-		buffer_put_int(msg, c->remote_id);
+		buffer_put_int(msg, SSH2_DISCONNECT_BY_APPLICATION);
+		buffer_put_string(msg, reason, strlen(reason));
+		s = "";
+		buffer_put_string(msg, s, strlen(s));
 
 		len = buffer_len(msg);
-		outmsg = begin_send_packet(pvar, SSH2_MSG_CHANNEL_CLOSE, len);
+		outmsg = begin_send_packet(pvar, SSH2_MSG_DISCONNECT, len);
 		memcpy(outmsg, buffer_ptr(msg), len);
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		c->state |= SSH_CHANNEL_STATE_CLOSE_SENT;
-
-		notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_CLOSE was sent at SSH_notify_disconnecting().", LOG_LEVEL_VERBOSE);
+		notify_verbose_message(pvar, "SSH2_MSG_DISCONNECT was sent at SSH_notify_disconnecting().", LOG_LEVEL_VERBOSE);
 	}
-
 }
 
 void SSH_notify_host_OK(PTInstVar pvar)
@@ -2971,7 +2975,7 @@
 				if (deflate(&pvar->ssh_state.compress_stream, Z_NO_FLUSH) != Z_OK) {
 					UTIL_get_lang_msg("MSG_SSH_COMP_ERROR", pvar,
 									  "Error compressing packet data");
-					notify_fatal_error(pvar, pvar->ts->UIMsg);
+					notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 					return;
 				}
 
@@ -2982,7 +2986,7 @@
 				if (deflate(&pvar->ssh_state.compress_stream, Z_SYNC_FLUSH) != Z_OK) {
 					UTIL_get_lang_msg("MSG_SSH_COMP_ERROR", pvar,
 					                  "Error compressing packet data");
-					notify_fatal_error(pvar, pvar->ts->UIMsg);
+					notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 					return;
 				}
 			} else {
@@ -3022,7 +3026,7 @@
 		if (inflate(&pvar->ssh_state.decompress_stream, Z_SYNC_FLUSH) != Z_OK) {
 			UTIL_get_lang_msg("MSG_SSH_INVALID_COMPDATA_ERROR", pvar,
 			                  "Invalid compressed data in received packet");
-			notify_fatal_error(pvar, pvar->ts->UIMsg);
+			notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 			return 0;
 		}
 	}
@@ -3324,7 +3328,7 @@
 			if (deflate(&pvar->ssh_state.compress_stream, Z_NO_FLUSH) != Z_OK) {
 				UTIL_get_lang_msg("MSG_SSH_COMP_ERROR", pvar,
 				                  "Error compressing packet data");
-				notify_fatal_error(pvar, pvar->ts->UIMsg);
+				notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 				return;
 			}
 
@@ -3336,7 +3340,7 @@
 				Z_OK) {
 				UTIL_get_lang_msg("MSG_SSH_COMP_ERROR", pvar,
 				                  "Error compressing packet data");
-				notify_fatal_error(pvar, pvar->ts->UIMsg);
+				notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 				return;
 			}
 		} else {
@@ -3810,7 +3814,7 @@
 	if (c == NULL) {
 		UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar,
 		                  "Could not open new channel. TTSSH is already opening too many channels.");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		goto error;
 	}
 
@@ -3950,7 +3954,7 @@
 	if (c == NULL) {
 		UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar,
 		                  "Could not open new channel. TTSSH is already opening too many channels.");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		goto error;
 	}
 
@@ -5066,7 +5070,7 @@
 	buffer_free(pvar->peer_kex);
 	pvar->peer_kex = NULL;
 
-	notify_fatal_error(pvar, msg);
+	notify_fatal_error(pvar, msg, TRUE);
 
 	return FALSE;
 }
@@ -5127,7 +5131,7 @@
 	DH_free(dh);
 	buffer_free(msg);
 
-	notify_fatal_error(pvar, "error occurred @ SSH2_dh_kex_init()");
+	notify_fatal_error(pvar, "error occurred @ SSH2_dh_kex_init()", TRUE);
 }
 
 
@@ -5192,7 +5196,7 @@
 error:;
 	buffer_free(msg);
 
-	notify_fatal_error(pvar, "error occurred @ SSH2_dh_gex_kex_init()");
+	notify_fatal_error(pvar, "error occurred @ SSH2_dh_gex_kex_init()", TRUE);
 }
 
 
@@ -5333,7 +5337,7 @@
 	EC_KEY_free(client_key);
 	buffer_free(msg);
 
-	notify_fatal_error(pvar, "error occurred @ SSH2_ecdh_kex_init()");
+	notify_fatal_error(pvar, "error occurred @ SSH2_ecdh_kex_init()", TRUE);
 }
 
 
@@ -5572,7 +5576,7 @@
 	if (dh_buf != NULL) free(dh_buf);
 	BN_free(share_key);
 
-	notify_fatal_error(pvar, emsg);
+	notify_fatal_error(pvar, emsg, TRUE);
 
 	return FALSE;
 }
@@ -5806,7 +5810,7 @@
 	if (dh_buf != NULL) free(dh_buf);
 	BN_free(share_key);
 
-	notify_fatal_error(pvar, emsg);
+	notify_fatal_error(pvar, emsg, TRUE);
 
 	return FALSE;
 }
@@ -6052,7 +6056,7 @@
 	if (ecdh_buf != NULL) free(ecdh_buf);
 	BN_free(share_key);
 
-	notify_fatal_error(pvar, emsg);
+	notify_fatal_error(pvar, emsg, TRUE);
 
 	return FALSE;
 }
@@ -6622,7 +6626,7 @@
 	if (c == NULL) {
 		UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar,
 		                  "Could not open new channel. TTSSH is already opening too many channels.");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		return FALSE;
 	}
 	// \x83V\x83F\x83\x8B\x82\xCCID\x82\xF0\x8E\xE6\x82\xC1\x82Ă\xA8\x82\xAD
@@ -6682,7 +6686,7 @@
 	if (cstring == NULL) {
 		UTIL_get_lang_msg("MSG_SSH_SERVER_NO_AUTH_METHOD_ERROR", pvar,
 		                  "The server doesn't have valid authentication method.");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 		return FALSE;
 	}
 
@@ -6763,7 +6767,7 @@
 				strncat_s(uimsg, sizeof(uimsg), pvar->ts->UIMsg, _TRUNCATE);
 			}
 		}
-		notify_fatal_error(pvar, uimsg);
+		notify_fatal_error(pvar, uimsg, TRUE);
 		return TRUE;
 	}
 
@@ -8528,9 +8532,6 @@
 	char *data;
 	int id;
 	Channel_t *c;
-	buffer_t *msg;
-	char *s;
-	unsigned char *outmsg;
 	char log[128];
 
 	// \x83R\x83l\x83N\x83V\x83\x87\x83\x93\x90?f\x8E\x9E\x82?A\x83p\x83P\x83b\x83g\x83_\x83\x93\x83v\x82\xF0\x83t\x83@\x83C\x83\x8B\x82?|\x82\xAB\x8Fo\x82\xB7\x81B
@@ -8556,33 +8557,10 @@
 	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
 
 	if (c->type == TYPE_SHELL) {
-		// notify_closed_connection() \x82\xA9\x82\xE7\x8CĂ?\xEA\x82\xE9 SSH_notify_disconnecting() \x82?\x86\x82\xC5
-		// SSH2_MSG_CHANNEL_CLOSE \x82\xAA\x91\x97\x90M\x82\xB3\x82\xEA\x82\xE9\x82??C\x82\xB9\x82\xE9\x81B
-		// \x83N\x83\x89\x83C\x83A\x83\x93\x83g\x82\xA9\x82\xE7 SSH2_MSG_DISCONNECT \x82?\xE7\x82?\xAD\x82Ă\xE0\x81A\x82\xB7\x82?Ă\xCC CHANNEL \x82\xAA\x95?\xB6\x82\xEA\x82\xCE
-		// \x83T\x81[\x83o\x82\xA9\x82\xE7 SSH2_MSG_DISCONNECT \x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAD\x82邱\x82?\xF0\x8A\xFA\x91?\xB7\x82\xE9\x81B
-		/*
-		msg = buffer_init();
-		if (msg == NULL) {
-			// TODO: error check
-			return FALSE;
-		}
-		buffer_put_int(msg, SSH2_DISCONNECT_PROTOCOL_ERROR);
-		s = "disconnected by server request";
-		buffer_put_string(msg, s, strlen(s));
-		s = "";
-		buffer_put_string(msg, s, strlen(s));
+		ssh2_channel_send_close(pvar, c);
 
-		len = buffer_len(msg);
-		outmsg = begin_send_packet(pvar, SSH2_MSG_DISCONNECT, len);
-		memcpy(outmsg, buffer_ptr(msg), len);
-		finish_send_packet(pvar);
-		buffer_free(msg);
-
-		notify_verbose_message(pvar, "SSH2_MSG_DISCONNECT was sent at handle_SSH2_channel_close().", LOG_LEVEL_VERBOSE);
-		*/
-
 		// TCP connection closed
-		notify_closed_connection(pvar);
+		notify_closed_connection(pvar, "disconnected by server request");
 
 	} else if (c->type == TYPE_PORTFWD) {
 		// CHANNEL_CLOSE \x82?\xE8\x95?\xB3\x82?\xA2\x82?\x8A\x83\x82\x81[\x83g\x82\xCCchannel\x82\xAA\x8AJ\x95\xFA\x82\xB3\x82\xEA\x82?\xA2

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2014-10-03 14:32:29 UTC (rev 5677)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2014-10-04 03:39:24 UTC (rev 5678)
@@ -820,15 +820,14 @@
 	                       LOG_LEVEL_VERBOSE);
 }
 
-void notify_closed_connection(PTInstVar pvar)
+void notify_closed_connection(PTInstVar pvar, char FAR * send_msg)
 {
-	SSH_notify_disconnecting(pvar, NULL);
+	SSH_notify_disconnecting(pvar, send_msg);
 	AUTH_notify_disconnecting(pvar);
 	HOSTS_notify_disconnecting(pvar);
 
 	PostMessage(pvar->NotificationWindow, WM_USER_COMMNOTIFY,
 	            pvar->socket, MAKELPARAM(FD_CLOSE, 0));
-
 }
 
 static void add_err_msg(PTInstVar pvar, char FAR * msg)
@@ -869,7 +868,7 @@
 	}
 }
 
-void notify_fatal_error(PTInstVar pvar, char FAR * msg)
+void notify_fatal_error(PTInstVar pvar, char FAR * msg, BOOL send_disconnect)
 {
 	if (msg[0] != 0) {
 		notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
@@ -879,7 +878,9 @@
 	if (!pvar->fatal_error) {
 		pvar->fatal_error = TRUE;
 
-		SSH_notify_disconnecting(pvar, msg);
+		if (send_disconnect) {
+			SSH_notify_disconnecting(pvar, msg);
+		}
 		AUTH_notify_disconnecting(pvar);
 		HOSTS_notify_disconnecting(pvar);
 

Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h	2014-10-03 14:32:29 UTC (rev 5677)
+++ trunk/ttssh2/ttxssh/ttxssh.h	2014-10-04 03:39:24 UTC (rev 5678)
@@ -298,9 +298,9 @@
 #define SSHv2(pvar) ((pvar)->protocol_major == 2)
 
 void notify_established_secure_connection(PTInstVar pvar);
-void notify_closed_connection(PTInstVar pvar);
+void notify_closed_connection(PTInstVar pvar, char FAR * send_msg);
 void notify_nonfatal_error(PTInstVar pvar, char FAR * msg);
-void notify_fatal_error(PTInstVar pvar, char FAR * msg);
+void notify_fatal_error(PTInstVar pvar, char FAR * msg, BOOL send_disconnect);
 void notify_verbose_message(PTInstVar pvar, char FAR * msg, int level);
 
 void get_teraterm_dir_relative_name(char FAR * buf, int bufsize, char FAR * basename);

From svnnotify ＠ sourceforge.jp  Sun Oct  5 00:22:07 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 05 Oct 2014 00:22:07 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2NzldICBUVFNTSCDjga4gQWJvdXQg44OA?=
 =?utf-8?b?44Kk44Ki44Ot44Kw44Gu44Op44Oz44OA44Og44Ki44O844OI44KS6KGo56S6?=
 =?utf-8?b?44GZ44KL44Ko44OH44Kj44OD44OI44Oc44OD44Kv44K544Gr44CB6KiA6Kqe?=
 =?utf-8?b?44OV44Kh44Kk44Or44GL44KJ44OV44Kp44Oz44OI44KS6Kqt44G/6L6844KB?=
 =?utf-8?b?44Gq44GE5aC05ZCI44Gr562J5bmF44OV44Kp44Oz44OI44KS44K744OD44OI?=
 =?utf-8?b?44GZ44KL44KI44GG44Gr44GX44Gf?=
Message-ID: <1412436127.080294.23650.nullmailer@users.sourceforge.jp>

Revision: 5679
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5679
Author:   maya
Date:     2014-10-05 00:22:06 +0900 (Sun, 05 Oct 2014)
Log Message:
-----------
TTSSH の About ダイアログのランダムアートを表示するエディットボックスに、言語ファイルからフォントを読み込めない場合に等幅フォントをセットするようにした

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ttxssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2014-10-04 03:39:24 UTC (rev 5678)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2014-10-04 15:22:06 UTC (rev 5679)
@@ -2552,7 +2552,19 @@
 		if (UTIL_get_lang_font("DLG_ABOUT_FONT", dlg, &logfont, &DlgAboutTextFont, pvar)) {
 			SendDlgItemMessage(dlg, IDC_ABOUTTEXT, WM_SETFONT, (WPARAM)DlgAboutTextFont, MAKELPARAM(TRUE,0));
 		} else {
-			DlgAboutTextFont = NULL;
+			// \x93??\x9E\x82??\xA9\x82\xC1\x82\xBD\x8F?\x82?\x99\x95\x9D\x83t\x83H\x83\x93\x83g\x82\xF0\x8Ew\x92?\x82\xE9\x81B
+			// \x83G\x83f\x83B\x83b\x83g\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82?_\x83C\x83A\x83\x8D\x83O\x82?\xAF\x82\xB6\x83t\x83H\x83\x93\x83g\x82\xF0\x8E\x9D\x82\xC1\x82Ă\xA8\x82\xE8
+			// \x93\x99\x95\x9D\x83t\x83H\x83\x93\x83g\x82ł??\xA2\x82\xBD\x82?B
+			strncpy_s(logfont.lfFaceName, sizeof(logfont.lfFaceName), "Courier New", _TRUNCATE);
+			logfont.lfCharSet = 0;
+			logfont.lfHeight = MulDiv(8, GetDeviceCaps(GetDC(dlg),LOGPIXELSY) * -1, 72);
+			logfont.lfWidth = 0;
+			if ((DlgAboutTextFont = CreateFontIndirect(&logfont)) != NULL) {
+				SendDlgItemMessage(dlg, IDC_ABOUTTEXT, WM_SETFONT, (WPARAM)DlgAboutTextFont, MAKELPARAM(TRUE,0));
+			}
+			else {
+				DlgAboutTextFont = NULL;
+			}
 		}
 
 		// \x83A\x83C\x83R\x83\x93\x82?I\x82?Z\x83b\x83g

From svnnotify ＠ sourceforge.jp  Sun Oct  5 17:18:07 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 05 Oct 2014 17:18:07 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2ODBdICDmlLnniYjlsaXmrbTjgpLmm7Q=?=
 =?utf-8?b?5paw44GX44Gf44CC?=
Message-ID: <1412497087.648892.2055.nullmailer@users.sourceforge.jp>

Revision: 5680
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5680
Author:   yutakapon
Date:     2014-10-05 17:18:06 +0900 (Sun, 05 Oct 2014)
Log Message:
-----------
改版履歴を更新した。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2014-10-04 15:22:06 UTC (rev 5679)
+++ trunk/doc/en/html/about/history.html	2014-10-05 08:18:06 UTC (rev 5680)
@@ -43,7 +43,7 @@
       <li>upgraded TTSSH to <a href="#ttssh_2.71">2.71</a></li>
       <li>added the Traditional Chinese.lng language file. Special thanks to Wei Yan.</li>
       <li>added support for 64bit Cygwin connection automatically.</li>
-      <!--li>64bit?cyglaunch.exe????????</li-->
+      <li>removed the 64bit cyglaunch.exe program.</li>
     </ul>
   </li>
 </ul>
@@ -2492,6 +2492,9 @@
 <h3><a name="ttssh_2.71">2014.xx.xx (Ver 2.71)</a></h3>
 <ul class="history">
   <li>Changes
+    <ul>
+      <li>Changed the SSH disconnection sequence.</li>
+    </ul>
   </li>
 
   <li>Bug fixes

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2014-10-04 15:22:06 UTC (rev 5679)
+++ trunk/doc/ja/html/about/history.html	2014-10-05 08:18:06 UTC (rev 5680)
@@ -2497,6 +2497,9 @@
 <h3><a name="ttssh_2.71">2014.xx.xx (Ver 2.71)</a></h3>
 <ul class="history">
   <li>\x95ύX
+    <ul>
+      <li>SSH\x90?f\x83V\x81[\x83P\x83\x93\x83X\x82?\x88\x97\x9D\x82\xF0\x95ύX\x82\xB5\x82\xBD\x81B</li>
+    </ul>
   </li>
 
   <li>\x83o\x83O\x8FC\x90\xB3

From svnnotify ＠ sourceforge.jp  Mon Oct  6 00:26:34 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 06 Oct 2014 00:26:34 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2ODFdICBDeWd3aW4g44Gr44Gk44GE44Gm?=
 =?utf-8?b?44Gu44OJ44Kt44Ol44Oh44Oz44OI44KS5pu05paw?=
Message-ID: <1412522794.528485.8299.nullmailer@users.sourceforge.jp>

Revision: 5681
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5681
Author:   maya
Date:     2014-10-06 00:26:34 +0900 (Mon, 06 Oct 2014)
Log Message:
-----------
Cygwin についてのドキュメントを更新

Modified Paths:
--------------
    trunk/doc/en/html/usage/cygwin.html
    trunk/doc/ja/html/usage/cygwin.html

-------------- next part --------------
Modified: trunk/doc/en/html/usage/cygwin.html
===================================================================
--- trunk/doc/en/html/usage/cygwin.html	2014-10-05 08:18:06 UTC (rev 5680)
+++ trunk/doc/en/html/usage/cygwin.html	2014-10-05 15:26:34 UTC (rev 5681)
@@ -18,16 +18,58 @@
 </p>
 
 <p>
-[NOTE] Cygwin 1.5.x doesn't seem support Windows 7. Please use Cygwin 1.7.x on Windows 7.
+[NOTE] Cygwin 1.5.x doesn't seem support Windows 7. Please use Cygwin 1.7.x on Windows 7 or later.
 </p>
 
+
+
+<h2>Cygterm+</h2>
+
 <p>
-This package makes it possible to connect local Cygwin by using built in Cygterm.<br>
-Select "Cygwin connection" from "File" menu or press "Alt + G " to connect to Cygwin.<br>
-Prior connecting to Cygwin, Cygwin installation path has to be entered into Tera Term ini file.<br>
-The format is "drive-letter:\directory".
+<!--Tera Term \x82\xCD Cygwin \x82??\xB1\x82\xB7\x82邽\x82??A\x93\xE0\x95\x94\x82\xC5 Cygterm+ \x82?p\x82\xB5\x82Ă\xA2\x82?\xB7\x81B-->This package makes it possible to connect local Cygwin by using built in Cygterm.<br>
+Select "Cygwin connection" from "File" menu or press "Alt + G " to connect to Cygwin.
 </p>
 
+<!--h3>\x90?\xE8\x82??\xB6</h3-->
+
+<p>
+Be careful not to save [Setup] [Save setup] in the situation that it was started by cygterm.exe.<br>
+Otherwise telnet port number of TCP/IP is saved but 23 you will be confused by connection failure when you normally run Tera Term to do telnet.  In that case it will be recovered by saving the setting with specifying TCP/IP Port# 23.
+</p>
+
+<!--h3>Cygwin \x82?T\x82\xB5\x95\xFB</h3>
+
+<p>
+Cygterm+ \x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x82?\xCD Cygwin \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83p\x83X\x82\xF0\x8C\xA9\x82?\xAF\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82?\xB7\x81BTera Term \x82\xC6 cyglaunch \x82?\x9F\x82?\x87\x8F\x98\x82\xC5 Cygwin \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83p\x83X\x82\xF0\x92T\x82\xB5\x82?\xB7\x81B
+
+</p>
+
+<ol>
+  <li>TERATERM.INI
+    <ol>
+      <li>teraterm.exe \x82\xAA\x93??\x9E\x82\xF1\x82ł\xA2\x82\xE9 TERATERM.INI\x81A\x82\xA0\x82邢\x82\xCD cyglaunch.exe \x82?t\x83H\x83\x8B\x83_\x82?\xA0\x82\xE9 TERATERM.INI \x82\xCC CygwinDirectory \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x93?\xDE</li>
+      <li>CygwinDirectory \x82?\xBA\x82\xC9 bin\cygwin1.dll \x82\xAA\x82\xA0\x82?\x92\xB2\x82?\xE9</li>
+      <li>bin\cygwin1.dll \x82\xAA\x82\xA0\x82\xEA\x82\xCE PATH \x8A?\xAB\x95?\x94\x82?p\x83X\x82\xF0\x92?\xC1\x82\xB7\x82\xE9</li>
+      <li>cygterm.exe \x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9</li>
+    </ol></li>
+  <li>PATH \x8A?\xAB\x95?\x94
+    <ol>
+      <li>PATH \x8A?\xAB\x95?\x94\x82??\xC1\x82Ă\xA2\x82\xE9\x83t\x83H\x83\x8B\x83_\x82\xC9 bin\cygwin1.dll \x82\xAA\x82\xA0\x82?\x92\xB2\x82?\xE9</li>
+      <li>cygterm.exe \x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9</li>
+    </ol></li>
+  <li>\x83h\x83\x89\x83C\x83u\x83\x8B\x81[\x83g\x91\x8D\x93\x96\x82\xBD\x82\xE8
+    <ol>
+      <li>C \x82\xA9\x82\xE7 Z \x82?ŁA\x83h\x83\x89\x83C\x83u\x83\x8B\x81[\x83g\x92\xBC\x89\xBA\x82\xCC cygwin \x82\xA0\x82邢\x82\xCD cygwin64 \x83t\x83H\x83\x8B\x83_\x82\xC9 bin\cygwin1.dll \x82\xAA\x82\xA0\x82?\x92\xB2\x82?\xE9</li>
+      <li>bin\cygwin1.dll \x82\xAA\x82\xA0\x82\xEA\x82\xCE PATH \x8A?\xAB\x95?\x94\x82?p\x83X\x82\xF0\x92?\xC1\x82\xB7\x82\xE9</li>
+      <li>cygterm.exe \x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9</li>
+    </ol></li>
+</ol>
+
+<p>
+1. \x82?uTERATERM.INI \x82\xCC CygwinDirectory\x81v\x82??\xE8\x82?A\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x8E\x9E\x82???\x9A\x97\xF1\x82??\xC1\x82Ă\xA2\x82\xE9\x82?Ŗ\xB3\x8E\x8B\x82\xB3\x82\xEA\x82?\xB7\x81B\x8E\xA9\x93\xAE\x8C\x9F\x8D\x{142A82}\xA4\x82?\xAD\x82\xA2\x82\xA9\x82?\xA2\x8F?\x82?蓮\x82\xC5 Cygwin \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83p\x83X\x82\xF0\x90??\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
+The format is "drive-letter:\directory".
+</p-->
+
 <pre>
 ----------------------------
 ; Cygwin install path
@@ -37,11 +79,23 @@
 ----------------------------
 </pre>
 
+<h3>64bit Cygwin</h3>
+
 <p>
-[NOTE]<br>
+<!--
+64bit Cygwin \x82??\xB1\x82\xB7\x82\xE9\x82?\xCD 64 bit Cygwin \x82Ńr\x83\x8B\x83h\x82\xB3\x82?\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xAA\x95K\x97v\x82ł\xB7\x81B\x92?\xED\x82\xCDTera Term\x82?C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xAA\x81A\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9Cygwin\x82?o\x81[\x83W\x83\x87\x83\x93\x82??\x82ēK\x90??\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0\x83R\x83s\x81[\x82\xB5\x82?\xB7\x81B<br>
+\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82?s\x8B?\x82\xAA\x82\xA0\x82\xE9\x8F?\x82?蓮\x82\xC5 cygterm+-x86_64 \x83t\x83H\x83\x8B\x83_\x93\xE0\x82?\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0 Tera Term \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83t\x83H\x83\x8B\x83_\x82??\x82\xAB\x82\xB7\x82?\x81A\x8E\xA9\x95\xAA\x82\xC5Cygterm+\x82\xF0\x83r\x83\x8B\x83h\x82\xB5\x92\xBC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+-->
 If cygterm fails to start you might need to download its source and recompile it.<br>
 If a user uses the 64bit Cygwin, please overwrite an execution file of the cygterm+-x86_64 folder at the 
 Tera Term installation folder. Or, rebuild the cygterm program.<br>
+
+</p>
+
+<h3>Build Cygterm+</h3>
+
+<p>
+Tera Term \x82?\xAF\x8D\xAB\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82?\xE2\x91肪\x82\xA0\x82\xC1\x82Ă\xA4\x82?\xAD\x8BN\x93\xAE\x82\xB5\x82?\xA2\x8F?\x82?ACygterm+ \x82\xF0\x83r\x83\x8B\x83h\x82\xB5\x92\xBC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
 Latest source code is included as cygterm+.tar.gz.
 </p>
 
@@ -61,13 +115,8 @@
   </tr>
 </table>
 
-<p>
-Be careful not to save [Setup] [Save setup] in the situation that it was started by cygterm.exe.<br>
-Otherwise telnet port number of TCP/IP is saved but 23 you will be confused by connection failure when you normally run Tera Term to do telnet.  In that case it will be recovered by saving the setting with specifying TCP/IP Port# 23.
-</p>
 
 
-
 <h2>Cygterm Here</h2>
 
 <p>

Modified: trunk/doc/ja/html/usage/cygwin.html
===================================================================
--- trunk/doc/ja/html/usage/cygwin.html	2014-10-05 08:18:06 UTC (rev 5680)
+++ trunk/doc/ja/html/usage/cygwin.html	2014-10-05 15:26:34 UTC (rev 5681)
@@ -18,13 +18,55 @@
 </p>
 
 <p>
-\x81\xA6\x92\x8D\x88?FCygwin 1.5.x \x82\xCD Windows 7 \x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA2\x82?\xA2\x82悤\x82ł\xB7\x81BWindows 7 \x82ł\xCD Cygwin 1.7.x \x82?p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+\x81\xA6\x92\x8D\x88?FCygwin 1.5.x \x82\xCD Windows 7 \x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA2\x82?\xA2\x82悤\x82ł\xB7\x81BWindows 7 \x88?~\x82ł\xCD Cygwin 1.7.x \x82?p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
 </p>
 
+
+
+<h2>Cygterm+</h2>
+
 <p>
-\x83\x8D\x81[\x83J\x83\x8B\x82\xCCCygwin\x82??\xB1\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B\x93\xE0\x95\x94\x82\xC5Cygterm\x82?p\x82\xB5\x82Ă\xA2\x82?\xB7\x81B<br>
-File\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uCygwin connection\x81v\x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9\x81A\x82\xE0\x82\xB5\x82\xAD\x82\xCDAlt+G\x82\xF0\x89\x9F\x89\xBA\x82\xB7\x82\xE9\x82?ACygwin\x82??\xB1\x82\xB5\x82?\xB7\x81B<br>
-\x82\xA0\x82?\x82\xB6\x82?Ateraterm.ini\x83t\x83@\x83C\x83\x8B\x82\xCC[Tera Term]\x83Z\x83N\x83V\x83\x87\x83\x93\x82?ACygwin\x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83p\x83X\x82\xF0\x90??\x82Ă\xA8\x82\xAD\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82?\xB7\x81B<br>
+Tera Term \x82\xCD Cygwin \x82??\xB1\x82\xB7\x82邽\x82??A\x93\xE0\x95\x94\x82\xC5 Cygterm+ \x82?p\x82\xB5\x82Ă\xA2\x82?\xB7\x81B<br>
+File\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uCygwin connection\x81v\x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9\x81A\x82\xE0\x82\xB5\x82\xAD\x82\xCD Alt+G \x82\xF0\x89\x9F\x89\xBA\x82\xB7\x82\xE9\x82?ACygwin \x82??\xB1\x82\xB5\x82?\xB7\x81B
+</p>
+
+<h3>\x90?\xE8\x82??\xB6</h3>
+
+<p>
+cygterm.exe \x82\xA9\x82\xE7\x8BN\x93\xAE\x82\xB3\x82?\x8F\xF3\x91?Ő?\xE8\x95?\xB6 [Setup] [Save setup] \x82\xF0\x8Ds\x82\xED\x82?\xA2\x82悤\x92\x8D\x88?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81BTCP/IP\x90?\xE8\x82\xCC Telnet\x83|\x81[\x83g\x94?\x86\x82\xAA 23 \x88?O\x82ŕ?\xB6\x82\xB3\x82\xEA\x81A\x92?\xED\x82\xCC Telnet\x96?I\x82?\xC0\x8Ds\x8E\x9E\x82??\xB1\x82ł\xAB\x82\xB8\x81A\x8DQ\x82Ă邱\x82???\xC1\x82Ă\xB5\x82?\xA2\x82?\xB7\x81B<br>
+TCP/IP Port# \x82\xC9 23 \x82\xF0\x8Ew\x92?\x82Đ?\xE8\x95?\xB6\x82\xB5\x92\xBC\x82\xB9\x82Ό\xB3\x82??\xE8\x82?\xB7\x81B
+</p>
+
+<h3>Cygwin \x82?T\x82\xB5\x95\xFB</h3>
+
+<p>
+Cygterm+ \x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x82?\xCD Cygwin \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83p\x83X\x82\xF0\x8C\xA9\x82?\xAF\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82?\xB7\x81BTera Term \x82\xC6 cyglaunch \x82?\x9F\x82?\x87\x8F\x98\x82\xC5 Cygwin \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83p\x83X\x82\xF0\x92T\x82\xB5\x82?\xB7\x81B
+
+</p>
+
+<ol>
+  <li>TERATERM.INI
+    <ol>
+      <li>teraterm.exe \x82\xAA\x93??\x9E\x82\xF1\x82ł\xA2\x82\xE9 TERATERM.INI\x81A\x82\xA0\x82邢\x82\xCD cyglaunch.exe \x82?t\x83H\x83\x8B\x83_\x82?\xA0\x82\xE9 TERATERM.INI \x82\xCC CygwinDirectory \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x93?\xDE</li>
+      <li>CygwinDirectory \x82?\xBA\x82\xC9 bin\cygwin1.dll \x82\xAA\x82\xA0\x82?\x92\xB2\x82?\xE9</li>
+      <li>bin\cygwin1.dll \x82\xAA\x82\xA0\x82\xEA\x82\xCE PATH \x8A?\xAB\x95?\x94\x82?p\x83X\x82\xF0\x92?\xC1\x82\xB7\x82\xE9</li>
+      <li>cygterm.exe \x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9</li>
+    </ol></li>
+  <li>PATH \x8A?\xAB\x95?\x94
+    <ol>
+      <li>PATH \x8A?\xAB\x95?\x94\x82??\xC1\x82Ă\xA2\x82\xE9\x83t\x83H\x83\x8B\x83_\x82\xC9 bin\cygwin1.dll \x82\xAA\x82\xA0\x82?\x92\xB2\x82?\xE9</li>
+      <li>cygterm.exe \x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9</li>
+    </ol></li>
+  <li>\x83h\x83\x89\x83C\x83u\x83\x8B\x81[\x83g\x91\x8D\x93\x96\x82\xBD\x82\xE8
+    <ol>
+      <li>C \x82\xA9\x82\xE7 Z \x82?ŁA\x83h\x83\x89\x83C\x83u\x83\x8B\x81[\x83g\x92\xBC\x89\xBA\x82\xCC cygwin \x82\xA0\x82邢\x82\xCD cygwin64 \x83t\x83H\x83\x8B\x83_\x82\xC9 bin\cygwin1.dll \x82\xAA\x82\xA0\x82?\x92\xB2\x82?\xE9</li>
+      <li>bin\cygwin1.dll \x82\xAA\x82\xA0\x82\xEA\x82\xCE PATH \x8A?\xAB\x95?\x94\x82?p\x83X\x82\xF0\x92?\xC1\x82\xB7\x82\xE9</li>
+      <li>cygterm.exe \x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9</li>
+    </ol></li>
+</ol>
+
+<p>
+1. \x82?uTERATERM.INI \x82\xCC CygwinDirectory\x81v\x82??\xE8\x82?A\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x8E\x9E\x82???\x9A\x97\xF1\x82??\xC1\x82Ă\xA2\x82\xE9\x82?Ŗ\xB3\x8E\x8B\x82\xB3\x82\xEA\x82?\xB7\x81B\x8E\xA9\x93\xAE\x8C\x9F\x8D\x{142A82}\xA4\x82?\xAD\x82\xA2\x82\xA9\x82?\xA2\x8F?\x82?蓮\x82\xC5 Cygwin \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83p\x83X\x82\xF0\x90??\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
 \x83t\x83H\x81[\x83}\x83b\x83g\x82?u\x83h\x83\x89\x83C\x83u\x96\xBC\x81F\x81\x8F\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x81v\x82ł\xB7\x81B
 </p>
 
@@ -37,10 +79,17 @@
 ----------------------------
 </pre>
 
+<h3>64bit Cygwin</h3>
+
 <p>
-\x81\xA6\x92\x8D\x88?F<br>
-cygterm\x82\xAA\x82\xA4\x82?\xAD\x8BN\x93\xAE\x82\xB5\x82?\xA2\x8F?\x82?Acygterm\x82\xF0\x83r\x83\x8B\x83h\x82\xB5\x92\xBC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
-64bit Cygwin \x82ŗ\x98\x97p\x82\xB7\x82\xE9\x82??Acygterm+-x86_64 \x83t\x83H\x83\x8B\x83_\x93\xE0\x82?\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0 Tera Term \x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x83t\x83H\x83\x8B\x83_\x82??\x82\xAB\x82\xB7\x82?\x81Acygterm\x82\xF0\x83r\x83\x8B\x83h\x82\xB5\x92\xBC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
+64bit Cygwin \x82??\xB1\x82\xB7\x82\xE9\x82?\xCD 64 bit Cygwin \x82Ńr\x83\x8B\x83h\x82\xB3\x82?\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xAA\x95K\x97v\x82ł\xB7\x81B\x92?\xED\x82\xCDTera Term\x82?C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xAA\x81A\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9Cygwin\x82?o\x81[\x83W\x83\x87\x83\x93\x82??\x82ēK\x90??\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0\x83R\x83s\x81[\x82\xB5\x82?\xB7\x81B<br>
+\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82?s\x8B?\x82\xAA\x82\xA0\x82\xE9\x8F?\x82?蓮\x82\xC5 cygterm+-x86_64 \x83t\x83H\x83\x8B\x83_\x93\xE0\x82?\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0 Tera Term \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83t\x83H\x83\x8B\x83_\x82??\x82\xAB\x82\xB7\x82?\x81A\x8E\xA9\x95\xAA\x82\xC5Cygterm+\x82\xF0\x83r\x83\x8B\x83h\x82\xB5\x92\xBC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+<h3>Cygterm+\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9</h3>
+
+<p>
+Tera Term \x82?\xAF\x8D\xAB\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82?\xE2\x91肪\x82\xA0\x82\xC1\x82Ă\xA4\x82?\xAD\x8BN\x93\xAE\x82\xB5\x82?\xA2\x8F?\x82?ACygterm+ \x82\xF0\x83r\x83\x8B\x83h\x82\xB5\x92\xBC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
 \x8DŐV\x82?\\x81[\x83X\x83R\x81[\x83h\x82\xCD cygterm+.tar.gz \x82?\xB5\x82ē\xAF\x8D\xAB\x82\xB3\x82\xEA\x82Ă\xA2\x82?\xB7\x81B
 </p>
 
@@ -60,13 +109,8 @@
   </tr>
 </table>
 
-<p>
-cygterm.exe \x82\xA9\x82\xE7\x8BN\x93\xAE\x82\xB3\x82?\x8F\xF3\x91?Ő?\xE8\x95?\xB6 [Setup][Save setup] \x82\xF0\x8Ds\x82\xED\x82?\xA2\x82悤\x92\x8D\x88?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81BTCP/IP\x90?\xE8\x82\xCC Telnet\x83|\x81[\x83g\x94?\x86\x82\xAA 23 \x88?O\x82ŕ?\xB6\x82\xB3\x82\xEA\x81A\x92?\xED\x82\xCC Telnet\x96?I\x82?\xC0\x8Ds\x8E\x9E\x82??\xB1\x82ł\xAB\x82\xB8\x81A\x8DQ\x82Ă邱\x82???\xC1\x82Ă\xB5\x82?\xA2\x82?\xB7\x81B<br>
-TCP/IP Port# \x82\xC9 23 \x82\xF0\x8Ew\x92?\x82Đ?\xE8\x95?\xB6\x82\xB5\x92\xBC\x82\xB9\x82Ό\xB3\x82??\xE8\x82?\xB7\x81B
-</p>
 
 
-
 <h2>Cygterm Here</h2>
 
 <p>

From svnnotify ＠ sourceforge.jp  Tue Oct  7 23:53:03 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 07 Oct 2014 23:53:03 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2ODJdICDnv7voqLPkuK0=?=
Message-ID: <1412693583.576040.12405.nullmailer@users.sourceforge.jp>

Revision: 5682
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5682
Author:   yutakapon
Date:     2014-10-07 23:53:02 +0900 (Tue, 07 Oct 2014)
Log Message:
-----------
翻訳中

Modified Paths:
--------------
    trunk/doc/en/html/usage/cygwin.html
    trunk/doc/ja/html/usage/cygwin.html

-------------- next part --------------
Modified: trunk/doc/en/html/usage/cygwin.html
===================================================================
--- trunk/doc/en/html/usage/cygwin.html	2014-10-05 15:26:34 UTC (rev 5681)
+++ trunk/doc/en/html/usage/cygwin.html	2014-10-07 14:53:02 UTC (rev 5682)
@@ -26,11 +26,11 @@
 <h2>Cygterm+</h2>
 
 <p>
-<!--Tera Term \x82\xCD Cygwin \x82??\xB1\x82\xB7\x82邽\x82??A\x93\xE0\x95\x94\x82\xC5 Cygterm+ \x82?p\x82\xB5\x82Ă\xA2\x82?\xB7\x81B-->This package makes it possible to connect local Cygwin by using built in Cygterm.<br>
+Tera Term uses the Cygterm+ program to connect local Cygwin.<br>
 Select "Cygwin connection" from "File" menu or press "Alt + G " to connect to Cygwin.
 </p>
 
-<!--h3>\x90?\xE8\x82??\xB6</h3-->
+<h3>Saving configuration</h3>
 
 <p>
 Be careful not to save [Setup] [Save setup] in the situation that it was started by cygterm.exe.<br>
@@ -82,14 +82,13 @@
 <h3>64bit Cygwin</h3>
 
 <p>
-<!--
-64bit Cygwin \x82??\xB1\x82\xB7\x82\xE9\x82?\xCD 64 bit Cygwin \x82Ńr\x83\x8B\x83h\x82\xB3\x82?\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xAA\x95K\x97v\x82ł\xB7\x81B\x92?\xED\x82\xCDTera Term\x82?C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xAA\x81A\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9Cygwin\x82?o\x81[\x83W\x83\x87\x83\x93\x82??\x82ēK\x90??\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0\x83R\x83s\x81[\x82\xB5\x82?\xB7\x81B<br>
-\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82?s\x8B?\x82\xAA\x82\xA0\x82\xE9\x8F?\x82?蓮\x82\xC5 cygterm+-x86_64 \x83t\x83H\x83\x8B\x83_\x93\xE0\x82?\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0 Tera Term \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83t\x83H\x83\x8B\x83_\x82??\x82\xAB\x82\xB7\x82?\x81A\x8E\xA9\x95\xAA\x82\xC5Cygterm+\x82\xF0\x83r\x83\x8B\x83h\x82\xB5\x92\xBC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
--->
-If cygterm fails to start you might need to download its source and recompile it.<br>
-If a user uses the 64bit Cygwin, please overwrite an execution file of the cygterm+-x86_64 folder at the 
-Tera Term installation folder. Or, rebuild the cygterm program.<br>
-
+A user needs an execution file by 
+Tera Term needs the cygterm+ program built on the 64bit Cygwin environment to connect 64bit Cygwin.
+Basically, Tera Term installation program will recognize the installed Cygwin version and copy an 
+appropriate cygterm+ program.<br>
+If the Tera Term installer makes an error in determination, please overwrite the cygterm.exe in the 
+cygterm+-x86_64 directory to the Tera Term installation directory. Moreover, please rebuild the 
+Cygterm+ source code.
 </p>
 
 <h3>Build Cygterm+</h3>

Modified: trunk/doc/ja/html/usage/cygwin.html
===================================================================
--- trunk/doc/ja/html/usage/cygwin.html	2014-10-05 15:26:34 UTC (rev 5681)
+++ trunk/doc/ja/html/usage/cygwin.html	2014-10-07 14:53:02 UTC (rev 5682)
@@ -82,8 +82,8 @@
 <h3>64bit Cygwin</h3>
 
 <p>
-64bit Cygwin \x82??\xB1\x82\xB7\x82\xE9\x82?\xCD 64 bit Cygwin \x82Ńr\x83\x8B\x83h\x82\xB3\x82?\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xAA\x95K\x97v\x82ł\xB7\x81B\x92?\xED\x82\xCDTera Term\x82?C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xAA\x81A\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9Cygwin\x82?o\x81[\x83W\x83\x87\x83\x93\x82??\x82ēK\x90??\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0\x83R\x83s\x81[\x82\xB5\x82?\xB7\x81B<br>
-\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82?s\x8B?\x82\xAA\x82\xA0\x82\xE9\x8F?\x82?蓮\x82\xC5 cygterm+-x86_64 \x83t\x83H\x83\x8B\x83_\x93\xE0\x82?\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0 Tera Term \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83t\x83H\x83\x8B\x83_\x82??\x82\xAB\x82\xB7\x82?\x81A\x8E\xA9\x95\xAA\x82\xC5Cygterm+\x82\xF0\x83r\x83\x8B\x83h\x82\xB5\x92\xBC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+64bit Cygwin \x82??\xB1\x82\xB7\x82\xE9\x82?\xCD 64 bit Cygwin\x8A?\xAB \x82Ńr\x83\x8B\x83h\x82\xB3\x82? cygterm+ \x83v\x83\x8D\x83O\x83\x89\x83\x80\x82\xAA\x95K\x97v\x82ł\xB7\x81B\x92?\xED\x82\xCDTera Term\x82?C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xAA\x81A\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9Cygwin\x82?o\x81[\x83W\x83\x87\x83\x93\x82??\x82ēK\x90??\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0\x83R\x83s\x81[\x82\xB5\x82?\xB7\x81B<br>
+\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82?\xBB\x92肪\x90\xB3\x82\xB5\x82\xAD\x93\xAE\x8D?\x82Ă\xA2\x82?\xA2\x8F?\x82?A\x8E蓮\x82\xC5 cygterm+-x86_64 \x83t\x83H\x83\x8B\x83_\x93\xE0\x82?\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0 Tera Term \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83t\x83H\x83\x8B\x83_\x82??\x82\xAB\x82\xB7\x82?\x81A\x8E\xA9\x95\xAA\x82\xC5Cygterm+\x82\xF0\x83r\x83\x8B\x83h\x82\xB5\x92\xBC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
 </p>
 
 <h3>Cygterm+\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9</h3>

From svnnotify ＠ sourceforge.jp  Wed Oct  8 23:17:49 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 08 Oct 2014 23:17:49 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2ODNdICDoi7HoqLPlrozkuoY=?=
Message-ID: <1412777869.421792.25178.nullmailer@users.sourceforge.jp>

Revision: 5683
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5683
Author:   yutakapon
Date:     2014-10-08 23:17:48 +0900 (Wed, 08 Oct 2014)
Log Message:
-----------
英訳完了

Modified Paths:
--------------
    trunk/doc/en/html/usage/cygwin.html

-------------- next part --------------
Modified: trunk/doc/en/html/usage/cygwin.html
===================================================================
--- trunk/doc/en/html/usage/cygwin.html	2014-10-07 14:53:02 UTC (rev 5682)
+++ trunk/doc/en/html/usage/cygwin.html	2014-10-08 14:17:48 UTC (rev 5683)
@@ -37,38 +37,39 @@
 Otherwise telnet port number of TCP/IP is saved but 23 you will be confused by connection failure when you normally run Tera Term to do telnet.  In that case it will be recovered by saving the setting with specifying TCP/IP Port# 23.
 </p>
 
-<!--h3>Cygwin \x82?T\x82\xB5\x95\xFB</h3>
+<h3>How to search Cygwin</h3>
 
 <p>
-Cygterm+ \x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x82?\xCD Cygwin \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83p\x83X\x82\xF0\x8C\xA9\x82?\xAF\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82?\xB7\x81BTera Term \x82\xC6 cyglaunch \x82?\x9F\x82?\x87\x8F\x98\x82\xC5 Cygwin \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83p\x83X\x82\xF0\x92T\x82\xB5\x82?\xB7\x81B
-
+Tera Term must need to find the Cygwin installation path to launch the Cygterm+ program.
+So, Tera Term and cyglaunch will search the installation path in the following order.
 </p>
 
 <ol>
   <li>TERATERM.INI
     <ol>
-      <li>teraterm.exe \x82\xAA\x93??\x9E\x82\xF1\x82ł\xA2\x82\xE9 TERATERM.INI\x81A\x82\xA0\x82邢\x82\xCD cyglaunch.exe \x82?t\x83H\x83\x8B\x83_\x82?\xA0\x82\xE9 TERATERM.INI \x82\xCC CygwinDirectory \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x93?\xDE</li>
-      <li>CygwinDirectory \x82?\xBA\x82\xC9 bin\cygwin1.dll \x82\xAA\x82\xA0\x82?\x92\xB2\x82?\xE9</li>
-      <li>bin\cygwin1.dll \x82\xAA\x82\xA0\x82\xEA\x82\xCE PATH \x8A?\xAB\x95?\x94\x82?p\x83X\x82\xF0\x92?\xC1\x82\xB7\x82\xE9</li>
-      <li>cygterm.exe \x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9</li>
+      <li>Reads the CygwinDirectory entry in the TERATERM.INI file which is placed in the directory loaded by the teraterm.exe and the cyglaunch.exe directory.</li>
+      <li>Searches the bin\cygwin1.dll file under the CygwinDirectory folder.</li>
+      <li>Adds the bin\cygwin1.dll file into the PATH environment variable if the file exists.</li>
+      <li>Launch the cygterm.exe program.</li>
     </ol></li>
-  <li>PATH \x8A?\xAB\x95?\x94
+  <li>PATH environment variable
     <ol>
-      <li>PATH \x8A?\xAB\x95?\x94\x82??\xC1\x82Ă\xA2\x82\xE9\x83t\x83H\x83\x8B\x83_\x82\xC9 bin\cygwin1.dll \x82\xAA\x82\xA0\x82?\x92\xB2\x82?\xE9</li>
-      <li>cygterm.exe \x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9</li>
+      <li>Searches the bin\cygwin1.dll file into the directory included in the PATH environment variable.</li>
+      <li>Launch the cygterm.exe program.</li>
     </ol></li>
-  <li>\x83h\x83\x89\x83C\x83u\x83\x8B\x81[\x83g\x91\x8D\x93\x96\x82\xBD\x82\xE8
+  <li>Round robin drive root
     <ol>
-      <li>C \x82\xA9\x82\xE7 Z \x82?ŁA\x83h\x83\x89\x83C\x83u\x83\x8B\x81[\x83g\x92\xBC\x89\xBA\x82\xCC cygwin \x82\xA0\x82邢\x82\xCD cygwin64 \x83t\x83H\x83\x8B\x83_\x82\xC9 bin\cygwin1.dll \x82\xAA\x82\xA0\x82?\x92\xB2\x82?\xE9</li>
-      <li>bin\cygwin1.dll \x82\xAA\x82\xA0\x82\xEA\x82\xCE PATH \x8A?\xAB\x95?\x94\x82?p\x83X\x82\xF0\x92?\xC1\x82\xB7\x82\xE9</li>
-      <li>cygterm.exe \x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9</li>
+      <li>Searches the bin\cygwin1.dll file under cygwin and cygwin64 directory of the drive direct root from C: to Z:.</li>
+      <li>Searches the bin\cygwin1.dll file into the directory included in the PATH environment variable.</li>
+      <li>Launch the cygterm.exe program.</li>
     </ol></li>
 </ol>
 
 <p>
-1. \x82?uTERATERM.INI \x82\xCC CygwinDirectory\x81v\x82??\xE8\x82?A\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x8E\x9E\x82???\x9A\x97\xF1\x82??\xC1\x82Ă\xA2\x82\xE9\x82?Ŗ\xB3\x8E\x8B\x82\xB3\x82\xEA\x82?\xB7\x81B\x8E\xA9\x93\xAE\x8C\x9F\x8D\x{142A82}\xA4\x82?\xAD\x82\xA2\x82\xA9\x82?\xA2\x8F?\x82?蓮\x82\xC5 Cygwin \x82?C\x83\x93\x83X\x83g\x81[\x83\x8B\x83p\x83X\x82\xF0\x90??\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
+The CygwinDirectory entry in the TERATERM.INI file will be empty when Tera Term is newly installed.
+If the automatic retrieval is failed, please configure the CygwinDirectory entry.<br>
 The format is "drive-letter:\directory".
-</p-->
+</p>
 
 <pre>
 ----------------------------
@@ -94,7 +95,7 @@
 <h3>Build Cygterm+</h3>
 
 <p>
-Tera Term \x82?\xAF\x8D\xAB\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82?\xE2\x91肪\x82\xA0\x82\xC1\x82Ă\xA4\x82?\xAD\x8BN\x93\xAE\x82\xB5\x82?\xA2\x8F?\x82?ACygterm+ \x82\xF0\x83r\x83\x8B\x83h\x82\xB5\x92\xBC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
+When the cygterm.exe program can not work well, please rebuild the Cygterm+ source code.<br>
 Latest source code is included as cygterm+.tar.gz.
 </p>
 

From svnnotify ＠ sourceforge.jp  Sat Oct 11 10:16:14 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 11 Oct 2014 10:16:14 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2ODRdICDjgqLjgq/jgrvjgrnjgq3jg7wg?=
 =?utf-8?b?QWx0K0Qg44GoIEFsdCtHIOOCkueEoeWKueOBq+OBp+OBjeOCi+OCueOCpA==?=
 =?utf-8?b?44OD44OB44KS6L+95Yqg?=
Message-ID: <1412990174.123231.22011.nullmailer@users.sourceforge.jp>

Revision: 5684
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5684
Author:   maya
Date:     2014-10-11 10:16:12 +0900 (Sat, 11 Oct 2014)
Log Message:
-----------
アクセスキー Alt+D と Alt+G を無効にできるスイッチを追加
  https://sourceforge.jp/ticket/browse.php?group_id=1412&tid=34396

Modified Paths:
--------------
    trunk/installer/release/TERATERM.INI
    trunk/teraterm/common/tt_res.h
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/ttermpro.rc
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/ttpset/ttset.c

-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2014-10-08 14:17:48 UTC (rev 5683)
+++ trunk/installer/release/TERATERM.INI	2014-10-11 01:16:12 UTC (rev 5684)
@@ -62,18 +62,24 @@
 ; Starting the selection only by a left button.
 SelectOnlyByLButton=on
 
+; New connection by Alt-N Accelerator key
+AcceleratorNewConnection=on
+
 ; Duplicate session by Alt-D Accelerator key disabled
 DisableAcceleratorDuplicateSession=off
 
+; Cygwin connection by Alt-G Accelerator key
+AcceleratorCygwinConnection=on
+
 ; Send break by Alt-B Accelerator key disabled
 DisableAcceleratorSendBreak=off
 
+; New connection Menu disabled
+DisableMenuNewConnection=off
+
 ; Duplicate session Menu disabled
 DisableMenuDuplicateSession=off
 
-; New connection Menu disabled
-DisableMenuNewConnection=off
-
 ; Send break Menu disabled
 DisableMenuSendBreak=off
 

Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h	2014-10-08 14:17:48 UTC (rev 5683)
+++ trunk/teraterm/common/tt_res.h	2014-10-11 01:16:12 UTC (rev 5684)
@@ -186,6 +186,8 @@
 #define ID_ACC_AREYOUTHERE              50007
 #define ID_ACC_PASTE                    50008
 #define ID_ACC_DISCONNECT               50009
+#define ID_ACC_DUPLICATESESSION         50010
+#define ID_ACC_CYGWINCONNECTION         50011
 #define ID_FILE_NEWCONNECTION           50110
 #define ID_FILE_DUPLICATESESSION        50111
 #define ID_FILE_CYGWINCONNECTION        50112

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2014-10-08 14:17:48 UTC (rev 5683)
+++ trunk/teraterm/common/tttypes.h	2014-10-11 01:16:12 UTC (rev 5684)
@@ -582,6 +582,8 @@
 	char JoinSplitURLIgnoreEOLChar;
 	char MulticastName[MAX_PATH];
 	WORD DebugModes;
+	WORD AcceleratorNewConnection;
+	WORD AcceleratorCygwinConnection;
 };
 
 typedef struct tttset TTTSet, *PTTSet;
@@ -1045,6 +1047,10 @@
  * Increment the number of this macro value
  * when you change TMap or member of TMap.
  *
+ * - At version 4.85, ttset_memfilemap was replaced with ttset_memfilemap_25.
+ *   added tttset.AcceleratorNewConnection
+ *   added tttset.AcceleratorCygwinConnection
+ *
  * - At version 4.83, ttset_memfilemap was replaced with ttset_memfilemap_24.
  *   added tttset.DebugModes
  *
@@ -1187,4 +1193,4 @@
  *   added tttset.VTCompatTab.
  */
 
-#define TT_FILEMAPNAME "ttset_memfilemap_24"
+#define TT_FILEMAPNAME "ttset_memfilemap_25"

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2014-10-08 14:17:48 UTC (rev 5683)
+++ trunk/teraterm/teraterm/ttermpro.rc	2014-10-11 01:16:12 UTC (rev 5684)
@@ -621,8 +621,8 @@
     "R",            ID_ACC_PASTECR,         VIRTKEY, ALT, NOINVERT
     "P",            ID_ACC_PRINT,           VIRTKEY, ALT, NOINVERT
     "B",            ID_ACC_SENDBREAK,       VIRTKEY, ALT, NOINVERT
-    "G",            ID_FILE_CYGWINCONNECTION, VIRTKEY, ALT, NOINVERT
-    "D",            ID_FILE_DUPLICATESESSION, VIRTKEY, ALT, NOINVERT
+    "G",            ID_ACC_CYGWINCONNECTION, VIRTKEY, ALT, NOINVERT
+    "D",            ID_ACC_DUPLICATESESSION, VIRTKEY, ALT, NOINVERT
     "I",            ID_ACC_DISCONNECT,      VIRTKEY, ALT, NOINVERT
 END
 

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2014-10-08 14:17:48 UTC (rev 5683)
+++ trunk/teraterm/teraterm/vtwin.cpp	2014-10-11 01:16:12 UTC (rev 5684)
@@ -1637,7 +1637,7 @@
 			case ID_ACC_DISCONNECT:
 				Disconnect(TRUE);
 				return TRUE;
-			case ID_FILE_DUPLICATESESSION:
+			case ID_ACC_DUPLICATESESSION:
 				// added DisableAcceleratorDuplicateSession (2009.4.6 maya)
 				if (!ts.DisableAcceleratorDuplicateSession)
 					OnDuplicateSession();
@@ -1646,8 +1646,13 @@
 		if (ActiveWin==IdVT) {
 			switch (wID) {
 				case ID_ACC_NEWCONNECTION:
-					OnFileNewConnection();
+					if (ts.AcceleratorNewConnection)
+						OnFileNewConnection();
 					return TRUE;
+				case ID_ACC_CYGWINCONNECTION:
+					if (ts.AcceleratorCygwinConnection)
+						OnCygwinConnection();
+					return TRUE;
 				case ID_ACC_COPY:
 					OnEditCopy();
 					return TRUE;

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2014-10-08 14:17:48 UTC (rev 5683)
+++ trunk/teraterm/ttpset/ttset.c	2014-10-11 01:16:12 UTC (rev 5684)
@@ -1364,6 +1364,12 @@
 	ts->DisableAcceleratorDuplicateSession =
 		GetOnOff(Section, "DisableAcceleratorDuplicateSession", FName, FALSE);
 
+	ts->AcceleratorNewConnection =
+		GetOnOff(Section, "AcceleratorNewConnection", FName, TRUE);
+
+	ts->AcceleratorCygwinConnection =
+		GetOnOff(Section, "AcceleratorCygwinConnection", FName, TRUE);
+
 	// added DisableMenuDuplicateSession (2010.8.3 maya)
 	ts->DisableMenuDuplicateSession =
 		GetOnOff(Section, "DisableMenuDuplicateSession", FName, FALSE);
@@ -2566,6 +2572,12 @@
 	WriteOnOff(Section, "DisableAcceleratorDuplicateSession", FName,
 	           ts->DisableAcceleratorDuplicateSession);
 
+	WriteOnOff(Section, "AcceleratorNewConnection", FName,
+	           ts->AcceleratorNewConnection);
+
+	WriteOnOff(Section, "AcceleratorCygwinConnection", FName,
+	           ts->AcceleratorCygwinConnection);
+
 	// DisableMenuDuplicateSession
 	WriteOnOff(Section, "DisableMenuDuplicateSession", FName,
 	           ts->DisableMenuDuplicateSession);

From svnnotify ＠ sourceforge.jp  Tue Oct 14 12:55:16 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 14 Oct 2014 12:55:16 +0900
Subject: [Ttssh2-commit] [5685] typo fix.
Message-ID: <1413258916.296458.1438.nullmailer@users.sourceforge.jp>

Revision: 5685
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5685
Author:   doda
Date:     2014-10-14 12:55:14 +0900 (Tue, 14 Oct 2014)
Log Message:
-----------
typo fix.

Modified Paths:
--------------
    trunk/doc/en/html/usage/tips/vim.html
    trunk/doc/ja/html/usage/tips/vim.html

-------------- next part --------------
Modified: trunk/doc/en/html/usage/tips/vim.html
===================================================================
--- trunk/doc/en/html/usage/tips/vim.html	2014-10-11 01:16:12 UTC (rev 5684)
+++ trunk/doc/en/html/usage/tips/vim.html	2014-10-14 03:55:14 UTC (rev 5685)
@@ -28,13 +28,13 @@
   <tr> <td>ESC [ ? 25 l</td> <td>Makes the cursor invisible</td> </tr>
 
   <tr> <td rowspan="7">DECSCUSR</td>
-       <td>ESC SP 0 q</td> <td>Blink Block</td> </tr>
-  <tr> <td>ESC SP 1 q</td> <td>Blink Block</td> </tr>
-  <tr> <td>ESC SP 2 q</td> <td>Steady Block</td> </tr>
-  <tr> <td>ESC SP 3 q</td> <td>Blink Underline</td> </tr>
-  <tr> <td>ESC SP 4 q</td> <td>Steady Underline</td> </tr>
-  <tr> <td>ESC SP 5 q</td> <td>Blink Vertical line</td> </tr>
-  <tr> <td>ESC SP 6 q</td> <td>Steady Vertical line</td> </tr>
+       <td>ESC [ 0 SP q</td> <td>Blink Block</td> </tr>
+  <tr> <td>ESC [ 1 SP q</td> <td>Blink Block</td> </tr>
+  <tr> <td>ESC [ 2 SP q</td> <td>Steady Block</td> </tr>
+  <tr> <td>ESC [ 3 SP q</td> <td>Blink Underline</td> </tr>
+  <tr> <td>ESC [ 4 SP q</td> <td>Steady Underline</td> </tr>
+  <tr> <td>ESC [ 5 SP q</td> <td>Blink Vertical line</td> </tr>
+  <tr> <td>ESC [ 6 SP q</td> <td>Steady Vertical line</td> </tr>
 
   <tr> <td rowspan="2">WYSTCURM</td>
        <td>ESC [ 33 h</td> <td>Steady Wyse Cursor</td> </tr>

Modified: trunk/doc/ja/html/usage/tips/vim.html
===================================================================
--- trunk/doc/ja/html/usage/tips/vim.html	2014-10-11 01:16:12 UTC (rev 5684)
+++ trunk/doc/ja/html/usage/tips/vim.html	2014-10-14 03:55:14 UTC (rev 5685)
@@ -28,13 +28,13 @@
   <tr> <td>ESC [ ? 25 l</td> <td>\x83J\x81[\x83\\x83\x8B\x82\xF0\x94\xF1\x95\\x8E\xA6\x8F\xF3\x91??\xB7\x82\xE9</td> </tr>
 
   <tr> <td rowspan="7">DECSCUSR</td>
-       <td>ESC SP 0 q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82?^\x82œ_\x96?\xF3\x91??\xB7\x82\xE9</td> </tr>
-  <tr> <td>ESC SP 1 q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82?^\x82œ_\x96?\xF3\x91??\xB7\x82\xE9</td> </tr>
-  <tr> <td>ESC SP 2 q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82?^\x82œ_\x93\x94(\x94\xF1\x93_\x96\xC5)\x8F\xF3\x91??\xB7\x82\xE9</td> </tr>
-  <tr> <td>ESC SP 3 q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82\xF0\x89\xBA\x90\xFC\x82œ_\x96?\xF3\x91??\xB7\x82\xE9</td> </tr>
-  <tr> <td>ESC SP 4 q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82\xF0\x89\xBA\x90\xFC\x82œ_\x93\x94(\x94\xF1\x93_\x96\xC5)\x8F\xF3\x91??\xB7\x82\xE9</td> </tr>
-  <tr> <td>ESC SP 5 q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82\xF0\x8Fc\x90\xFC\x82œ_\x96?\xF3\x91??\xB7\x82\xE9</td> </tr>
-  <tr> <td>ESC SP 6 q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82\xF0\x8Fc\x90\xFC\x82œ_\x93\x94(\x94\xF1\x93_\x96\xC5)\x8F\xF3\x91??\xB7\x82\xE9</td> </tr>
+       <td>ESC [ 0 SP q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82?^\x82œ_\x96?\xF3\x91??\xB7\x82\xE9</td> </tr>
+  <tr> <td>ESC [ 1 SP q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82?^\x82œ_\x96?\xF3\x91??\xB7\x82\xE9</td> </tr>
+  <tr> <td>ESC [ 2 SP q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82?^\x82œ_\x93\x94(\x94\xF1\x93_\x96\xC5)\x8F\xF3\x91??\xB7\x82\xE9</td> </tr>
+  <tr> <td>ESC [ 3 SP q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82\xF0\x89\xBA\x90\xFC\x82œ_\x96?\xF3\x91??\xB7\x82\xE9</td> </tr>
+  <tr> <td>ESC [ 4 SP q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82\xF0\x89\xBA\x90\xFC\x82œ_\x93\x94(\x94\xF1\x93_\x96\xC5)\x8F\xF3\x91??\xB7\x82\xE9</td> </tr>
+  <tr> <td>ESC [ 5 SP q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82\xF0\x8Fc\x90\xFC\x82œ_\x96?\xF3\x91??\xB7\x82\xE9</td> </tr>
+  <tr> <td>ESC [ 6 SP q</td> <td>\x83J\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82\xF0\x8Fc\x90\xFC\x82œ_\x93\x94(\x94\xF1\x93_\x96\xC5)\x8F\xF3\x91??\xB7\x82\xE9</td> </tr>
 
   <tr> <td rowspan="2">WYSTCURM</td>
        <td>ESC [ 33 h</td> <td>\x83J\x81[\x83\\x83\x8B\x82\xF0\x93_\x93\x94(\x94\xF1\x93_\x96\xC5)\x8F\xF3\x91??\xB7\x82\xE9</td> </tr>

From svnnotify ＠ sourceforge.jp  Fri Oct 17 17:16:15 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Oct 2014 17:16:15 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B5686=5D__General_setup_=E3=83=80?=
 =?utf-8?b?44Kk44Ki44Ot44Kw44Gn6KiA6Kqe44OV44Kh44Kk44Or44GM44Oq44K544OI?=
 =?utf-8?b?44Gr5Ye644Gm44GT44Gq44GE44GT44Go44GM44GC44KL5ZWP6aGM44KS5L+u?=
 =?utf-8?b?5q2j?=
Message-ID: <1413533775.341689.7534.nullmailer@users.sourceforge.jp>

Revision: 5686
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5686
Author:   maya
Date:     2014-10-17 17:16:11 +0900 (Fri, 17 Oct 2014)
Log Message:
-----------
General setup ダイアログで言語ファイルがリストに出てこないことがある問題を修正

Modified Paths:
--------------
    trunk/teraterm/ttpdlg/ttdlg.c

-------------- next part --------------
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2014-10-14 03:55:14 UTC (rev 5685)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2014-10-17 08:16:11 UTC (rev 5686)
@@ -3029,15 +3029,17 @@
 #define LANG_PATH "lang"
 #define LANG_EXT ".lng"
 
-static void make_sel_lang_ui(void)
+static void make_sel_lang_ui(char *HomeDir)
 {
 	int    i;
 	int    file_num;
-	char   fullpath[1024] = LANG_PATH "\\*" LANG_EXT;
+	char   fullpath[1024];
 	HANDLE hFind;
 	WIN32_FIND_DATA fd;
 	char **p;
 
+	_snprintf_s(fullpath, sizeof(fullpath), _TRUNCATE, "%s\\%s\\*%s", HomeDir, LANG_PATH, LANG_EXT);
+
 	// \x83\x81\x83\x82\x83\x8A\x83t\x83\x8A\x81[
 	if (LangUIList) {
 		p = LangUIList;
@@ -3176,7 +3178,7 @@
 			}
 
 			// \x8D?\x89\x82?w\x92?\x82\xEA\x82Ă\xA2\x82?\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82??\x86\x82\xF0\x8Ao\x82\xA6\x82Ă\xA8\x82\xAD\x81B
-			make_sel_lang_ui();
+			make_sel_lang_ui(ts->HomeDir);
 			langui_sel = get_sel_lang_ui(LangUIList, ts->UILanguageFile_ini);
 			SetDropDownList(Dialog, IDC_GENLANG_UI, LangUIList, langui_sel);
 			if (LangUIList[0] == NULL) {

From svnnotify ＠ sourceforge.jp  Fri Oct 17 17:25:29 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Oct 2014 17:25:29 +0900
Subject: [Ttssh2-commit] [5687] Update to OpenSSL 1.0.1j
Message-ID: <1413534329.886874.31458.nullmailer@users.sourceforge.jp>

Revision: 5687
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5687
Author:   maya
Date:     2014-10-17 17:25:29 +0900 (Fri, 17 Oct 2014)
Log Message:
-----------
Update to OpenSSL 1.0.1j

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/reference/develop.txt
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/reference/develop.txt

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2014-10-17 08:16:11 UTC (rev 5686)
+++ trunk/doc/en/html/about/history.html	2014-10-17 08:25:29 UTC (rev 5687)
@@ -2504,6 +2504,9 @@
   </li>
 
   <li>Misc
+    <ul>
+      <li>upgraded OpenSSL to 1.0.1j</li>
+    </ul>
   </li>
 </ul>
 

Modified: trunk/doc/en/html/reference/develop.txt
===================================================================
--- trunk/doc/en/html/reference/develop.txt	2014-10-17 08:16:11 UTC (rev 5686)
+++ trunk/doc/en/html/reference/develop.txt	2014-10-17 08:25:29 UTC (rev 5687)
@@ -30,7 +30,7 @@
 
 * Libraries
 - Oniguruma 5.9.5 (http://www.geocities.jp/kosako3/oniguruma/)
-- OpenSSL 1.0.1i (http://www.openssl.org/)
+- OpenSSL 1.0.1j (http://www.openssl.org/)
 - zlib 1.2.8 (http://www.zlib.net/)
 - PuTTY 0.63 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 
@@ -113,7 +113,7 @@
      (2) Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.
      (3) Move 'libs' directory on the command prompt. And run buildoniguruma.bat.
 
-  3. OpenSSL (used by TTSSH and TTProxy)
+  3. OpenSSL (used by TTSSH)
      (1) Extract openssl source into libs/openssl directory.
      (2) When the libs/openssl/Makefile.bak file exists on the OpenSSL 1.0.0e or later, delete the file only once
      (3) Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2014-10-17 08:16:11 UTC (rev 5686)
+++ trunk/doc/ja/html/about/history.html	2014-10-17 08:25:29 UTC (rev 5687)
@@ -2509,6 +2509,9 @@
   </li>
 
   <li>\x82\xBB\x82?\xBC
+    <ul>
+      <li>OpenSSL 1.0.1j\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD</li>
+    </ul>
   </li>
 </ul>
 

Modified: trunk/doc/ja/html/reference/develop.txt
===================================================================
--- trunk/doc/ja/html/reference/develop.txt	2014-10-17 08:16:11 UTC (rev 5686)
+++ trunk/doc/ja/html/reference/develop.txt	2014-10-17 08:25:29 UTC (rev 5687)
@@ -30,7 +30,7 @@
 
 \x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A
 - Oniguruma 5.9.5 (http://www.geocities.jp/kosako3/oniguruma/)
-- OpenSSL 1.0.1i (http://www.openssl.org/)
+- OpenSSL 1.0.1j (http://www.openssl.org/)
 - zlib 1.2.8 (http://www.zlib.net/)
 - PuTTY 0.63 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 
@@ -116,7 +116,7 @@
      (2) \x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B
      (3) \x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82??\xAE\x82\xB5\x81Abuildoniguruma.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
 
-  3. OpenSSL (used by TTSSH and TTProxy)
+  3. OpenSSL (used by TTSSH)
      (1) openssl \x82?\\x81[\x83X\x82\xF0 libs/openssl \x82?\x86\x82?W\x8AJ\x82\xB7\x82\xE9\x81B
      (2) OpenSSL 1.0.0e \x88?~\x82ŁAlibs/openssl/Makefile.bak \x82\xAA\x8D?\x89\x82\xA9\x82瑶\x8D?\xB7\x82\xE9\x8F?\x82?A\x88\xEA\x93x\x82\xBE\x82\xAF\x8E蓮\x82ō?\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
      (3) \x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B

From svnnotify ＠ sourceforge.jp  Fri Oct 17 17:37:23 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Oct 2014 17:37:23 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2ODhdICDjg4njgq3jg6Xjg6Hjg7Pjg4g=?=
 =?utf-8?b?5pu05paw?=
Message-ID: <1413535043.817658.27474.nullmailer@users.sourceforge.jp>

Revision: 5688
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5688
Author:   maya
Date:     2014-10-17 17:37:23 +0900 (Fri, 17 Oct 2014)
Log Message:
-----------
ドキュメント更新
  r5684 ぶん追加

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5684

Modified Paths:
--------------
    trunk/doc/en/html/setup/teraterm-ini.html
    trunk/doc/en/html/setup/teraterm-misc.html
    trunk/doc/ja/html/setup/teraterm-ini.html
    trunk/doc/ja/html/setup/teraterm-misc.html

-------------- next part --------------
Modified: trunk/doc/en/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-ini.html	2014-10-17 08:25:29 UTC (rev 5687)
+++ trunk/doc/en/html/setup/teraterm-ini.html	2014-10-17 08:37:23 UTC (rev 5688)
@@ -68,6 +68,18 @@
 		<th>Note</th>
 	</tr>
 	<tr>
+		<td id="AcceleratorCygwinConnection"><a href="teraterm-misc.html#AcceleratorCygwinConnection">AcceleratorCygwinConnection</a></td>
+		<td style="width:250px;">on</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
+	<tr>
+		<td id="AcceleratorNewConnection"><a href="teraterm-misc.html#AcceleratorNewConnection">AcceleratorNewConnection</a></td>
+		<td style="width:250px;">on</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
+	<tr>
 		<td id="Accept8BitCtrl"><a href="teraterm-term.html#C1">Accept8BitCtrl</a></td>
 		<td style="width:250px;">on</td>
 		<td style="width:250px;">&lt;-</td>

Modified: trunk/doc/en/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-misc.html	2014-10-17 08:25:29 UTC (rev 5687)
+++ trunk/doc/en/html/setup/teraterm-misc.html	2014-10-17 08:37:23 UTC (rev 5688)
@@ -200,6 +200,22 @@
 </pre>
 
 
+<h1><a name="AcceleratorNewConnection">Disable accelerator key of New Connection</a></h1>
+
+<p>
+In order to disable accelerator key of "New Connection", change the AcceleratorNewConnection line at [Tera Term] section of the setup file like the following:
+</p>
+
+<pre>
+AcceleratorNewConnection=off
+</pre>
+
+<pre>
+Default:
+AcceleratorNewConnection=on
+</pre>
+
+
 <h1><a name="DisableAcceleratorDuplicateSession">Disable accelerator key of Duplicate session</a></h1>
 
 <p>
@@ -216,6 +232,22 @@
 </pre>
 
 
+<h1><a name="AcceleratorCygwinConnection">Disable accelerator key of Cygwin connection</a></h1>
+
+<p>
+In order to disable accelerator key of "Cygwin connection", change the AcceleratorCygwinConnection line at [Tera Term] section of the setup file like the following:
+</p>
+
+<pre>
+AcceleratorCygwinConnection=off
+</pre>
+
+<pre>
+Default:
+AcceleratorCygwinConnection=on
+</pre>
+
+
 <h1><a name="ClickableUrlBrowser">A browser by using Clickable URL</a></h1>
 
 <p>

Modified: trunk/doc/ja/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-ini.html	2014-10-17 08:25:29 UTC (rev 5687)
+++ trunk/doc/ja/html/setup/teraterm-ini.html	2014-10-17 08:37:23 UTC (rev 5688)
@@ -68,6 +68,18 @@
 		<th>\x94\xF5\x8Dl</th>
 	</tr>
 	<tr>
+		<td id="AcceleratorCygwinConnection"><a href="teraterm-misc.html#AcceleratorCygwinConnection">AcceleratorCygwinConnection</a></td>
+		<td style="width:250px;">on</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
+	<tr>
+		<td id="AcceleratorNewConnection"><a href="teraterm-misc.html#AcceleratorNewConnection">AcceleratorNewConnection</a></td>
+		<td style="width:250px;">on</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
+	<tr>
 		<td id="Accept8BitCtrl"><a href="teraterm-term.html#C1">Accept8BitCtrl</a></td>
 		<td style="width:250px;">on</td>
 		<td style="width:250px;">&lt;-</td>

Modified: trunk/doc/ja/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-misc.html	2014-10-17 08:25:29 UTC (rev 5687)
+++ trunk/doc/ja/html/setup/teraterm-misc.html	2014-10-17 08:37:23 UTC (rev 5688)
@@ -227,6 +227,22 @@
 </pre>
 
 
+<h1><a name="AcceleratorNewConnection">New Connection \x82?A\x83N\x83Z\x83\x89\x83\x8C\x81[\x83^\x83L\x81[\x82?\xF8\x82?\xB7\x82\xE9</a></h1>
+
+<p>
+New Connection \x82?A\x83N\x83Z\x83\x89\x83\x8C\x81[\x83^\x83L\x81[\x82?\xF8\x82?\xB7\x82\xE9\x82??A\x90?\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCC AcceleratorNewConnection \x8Ds\x82\xF0\x88?\xBA\x82?悤\x82?ύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+<pre>
+AcceleratorNewConnection=off
+</pre>
+
+<pre>
+\x8F?\xAA\x8E\x9E:
+AcceleratorNewConnection=on
+</pre>
+
+
 <h1><a name="DisableAcceleratorDuplicateSession">Duplicate session \x82?A\x83N\x83Z\x83\x89\x83\x8C\x81[\x83^\x83L\x81[\x82?\xF8\x82?\xB7\x82\xE9</a></h1>
 
 <p>
@@ -243,6 +259,22 @@
 </pre>
 
 
+<h1><a name="AcceleratorCygwinConnection">Cygwin connection \x82?A\x83N\x83Z\x83\x89\x83\x8C\x81[\x83^\x83L\x81[\x82?\xF8\x82?\xB7\x82\xE9</a></h1>
+
+<p>
+Cygwin connection \x82?A\x83N\x83Z\x83\x89\x83\x8C\x81[\x83^\x83L\x81[\x82?\xF8\x82?\xB7\x82\xE9\x82??A\x90?\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCC AcceleratorCygwinConnection \x8Ds\x82\xF0\x88?\xBA\x82?悤\x82?ύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+<pre>
+AcceleratorCygwinConnection=off
+</pre>
+
+<pre>
+\x8F?\xAA\x8E\x9E:
+AcceleratorCygwinConnection=on
+</pre>
+
+
 <h1><a name="ClickableUrlBrowser">\x83N\x83\x8A\x83b\x83J\x83u\x83\x8B URL \x82ŋN\x93\xAE\x82\xB7\x82\xE9\x83u\x83\x89\x83E\x83U</a></h1>
 
 <p>

From svnnotify ＠ sourceforge.jp  Fri Oct 17 17:43:31 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Oct 2014 17:43:31 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2ODldICDmlLnniYjlsaXmrbTjgpLmm7Q=?=
 =?utf-8?b?5paw?=
Message-ID: <1413535411.375846.12321.nullmailer@users.sourceforge.jp>

Revision: 5689
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5689
Author:   maya
Date:     2014-10-17 17:43:31 +0900 (Fri, 17 Oct 2014)
Log Message:
-----------
改版履歴を更新
  r5684, r5686 ぶん

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5684
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5686

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2014-10-17 08:37:23 UTC (rev 5688)
+++ trunk/doc/en/html/about/history.html	2014-10-17 08:43:31 UTC (rev 5689)
@@ -34,10 +34,24 @@
 <ul class="history">
   <li>Changes
     <ul>
+      <li>added new optional setting that can disable accelerator key of New Connection.
+        <ul>
+          <li>added <a href="../setup/teraterm-misc.html#AcceleratorNewConnection">AcceleratorNewConnection</a> entry to teraterm.ini.</li>
+        </ul></li>
+      <li>added new optional setting that can disable accelerator key of Cygwin connection.
+        <ul>
+          <li>added <a href="../setup/teraterm-misc.html#AcceleratorCygwinConnection">AcceleratorCygwinConnection</a> entry to teraterm.ini.</li>
+        </ul></li>
       <li>added the 3rd argument to specify the initial directory at the <a href="../macro/command/filenamebox.html">filenamebox</a> macro command.</li>
     </ul>
   </li>
 
+  <li>Bug fixes
+    <ul>
+      <!--li>General setup\x82?\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82?\xA2\x82\xB1\x82?\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li-->
+    </ul>
+  </li>
+
   <li>Misc
     <ul>
       <li>upgraded TTSSH to <a href="#ttssh_2.71">2.71</a></li>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2014-10-17 08:37:23 UTC (rev 5688)
+++ trunk/doc/ja/html/about/history.html	2014-10-17 08:43:31 UTC (rev 5689)
@@ -34,10 +34,24 @@
 <ul class="history">
   <li>\x95ύX
     <ul>
+      <li>New Connection \x82?A\x83N\x83Z\x83\x89\x83\x8C\x81[\x83^\x83L\x81[\x82?\xF8\x82?ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
+        <ul>
+          <li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-misc.html#AcceleratorNewConnection">AcceleratorNewConnection</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
+        </ul></li>
+      <li>Cygwin connection \x82?A\x83N\x83Z\x83\x89\x83\x8C\x81[\x83^\x83L\x81[\x82?\xF8\x82?ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
+        <ul>
+          <li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-misc.html#AcceleratorCygwinConnection">AcceleratorCygwinConnection</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
+        </ul></li>
       <li><a href="../macro/command/filenamebox.html">filenamebox</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82?\x89\x8A\xFA\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xF0\x8Ew\x92?\x82\xE9\x88\xF8\x90\x94\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 
+  <li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+      <li>General setup\x82?\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82?\xA2\x82\xB1\x82?\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+    </ul>
+  </li>
+
   <li>\x82\xBB\x82?\xBC
     <ul>
       <li><a href="#ttssh_2.71">TTSSH(2.71)</a>\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD\x81B</li>

From svnnotify ＠ sourceforge.jp  Sun Oct 19 00:50:04 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 19 Oct 2014 00:50:04 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2OTBdICDoi7HoqLM=?=
Message-ID: <1413647404.863633.10949.nullmailer@users.sourceforge.jp>

Revision: 5690
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5690
Author:   yutakapon
Date:     2014-10-19 00:50:03 +0900 (Sun, 19 Oct 2014)
Log Message:
-----------
英訳

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2014-10-17 08:43:31 UTC (rev 5689)
+++ trunk/doc/en/html/about/history.html	2014-10-18 15:50:03 UTC (rev 5690)
@@ -48,7 +48,7 @@
 
   <li>Bug fixes
     <ul>
-      <!--li>General setup\x82?\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82?\xA2\x82\xB1\x82?\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li-->
+      <li>The language file will not be shown in the General setup.</li>
     </ul>
   </li>
 

From svnnotify ＠ sourceforge.jp  Wed Oct 29 07:27:44 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 29 Oct 2014 07:27:44 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzU2OTFdICBBbHQrRCDjgaggQWx0K0kg44GM?=
 =?utf-8?b?IFZUIOOCpuOCo+ODs+ODieOCpuOBp+OBruOBv+acieWKueOBq+OBquOCiw==?=
 =?utf-8?b?44KI44GG44Gr44GX44Gf?=
Message-ID: <1414535264.899727.9289.nullmailer@users.sourceforge.jp>

Revision: 5691
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5691
Author:   maya
Date:     2014-10-29 07:27:39 +0900 (Wed, 29 Oct 2014)
Log Message:
-----------
Alt+D と Alt+I が VT ウィンドウでのみ有効になるようにした

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2014-10-18 15:50:03 UTC (rev 5690)
+++ trunk/teraterm/teraterm/vtwin.cpp	2014-10-28 22:27:39 UTC (rev 5691)
@@ -1634,14 +1634,6 @@
 			case ID_ACC_PASTE:
 				OnEditPaste();
 				return TRUE;
-			case ID_ACC_DISCONNECT:
-				Disconnect(TRUE);
-				return TRUE;
-			case ID_ACC_DUPLICATESESSION:
-				// added DisableAcceleratorDuplicateSession (2009.4.6 maya)
-				if (!ts.DisableAcceleratorDuplicateSession)
-					OnDuplicateSession();
-				return TRUE;
 		}
 		if (ActiveWin==IdVT) {
 			switch (wID) {
@@ -1649,10 +1641,18 @@
 					if (ts.AcceleratorNewConnection)
 						OnFileNewConnection();
 					return TRUE;
+				case ID_ACC_DUPLICATESESSION:
+					// added DisableAcceleratorDuplicateSession (2009.4.6 maya)
+					if (!ts.DisableAcceleratorDuplicateSession)
+						OnDuplicateSession();
+					return TRUE;
 				case ID_ACC_CYGWINCONNECTION:
 					if (ts.AcceleratorCygwinConnection)
 						OnCygwinConnection();
 					return TRUE;
+				case ID_ACC_DISCONNECT:
+					Disconnect(TRUE);
+					return TRUE;
 				case ID_ACC_COPY:
 					OnEditCopy();
 					return TRUE;

From svnnotify ＠ sourceforge.jp  Fri Oct 31 23:46:04 2014
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 31 Oct 2014 23:46:04 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B5692=5D_sprintf=2C__sprintf2_?=
 =?utf-8?b?44Oe44Kv44Ot44Kz44Oe44Oz44OJ44Gn5rWu5YuV5bCP5pWw54K55pWw44KS?=
 =?utf-8?b?6KGo44GZ5byV5pWw44KS5Yem55CG44Gn44GN44Gq44GE5ZWP6aGM44KS5L+u?=
 =?utf-8?b?5q2j?=
Message-ID: <1414766764.692763.16835.nullmailer@users.sourceforge.jp>

Revision: 5692
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5692
Author:   maya
Date:     2014-10-31 23:46:03 +0900 (Fri, 31 Oct 2014)
Log Message:
-----------
sprintf, sprintf2 マクロコマンドで浮動小数点数を表す引数を処理できない問題を修正
  浮動小数点数を IntVal の引数として受け取っても Int 部分しか受け取れない
  文字列として渡す必要がある

Modified Paths:
--------------
    trunk/teraterm/ttpmacro/ttl.c

-------------- next part --------------
Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c	2014-10-28 22:27:39 UTC (rev 5691)
+++ trunk/teraterm/ttpmacro/ttl.c	2014-10-31 14:46:03 UTC (rev 5692)
@@ -4374,12 +4374,17 @@
 
 					strncat_s(subFmt, sizeof(subFmt), p, 1);
 
-					if (type == STRING) {
+					if (type == STRING || type == DOUBLE) {
 						// \x95\xB6\x8E\x9A\x97\xF1\x82?\xB5\x82ē???\x83g\x83\x89\x83C
 						TmpErr = 0;
 						GetStrVal(Str, &TmpErr);
 						if (TmpErr == 0) {
-							_snprintf_s(buf2, sizeof(buf2), _TRUNCATE, subFmt, Str);
+							if (type == STRING) {
+								_snprintf_s(buf2, sizeof(buf2), _TRUNCATE, subFmt, Str);
+							}
+							else { // DOUBLE
+								_snprintf_s(buf2, sizeof(buf2), _TRUNCATE, subFmt, atof(Str));
+							}
 						}
 						else {
 							SetResult(3);
@@ -4392,12 +4397,7 @@
 						TmpErr = 0;
 						GetIntVal(&Num, &TmpErr);
 						if (TmpErr == 0) {
-							if (type == INTEGER) {
-								_snprintf_s(buf2, sizeof(buf2), _TRUNCATE, subFmt, Num);
-							}
-							else {
-								_snprintf_s(buf2, sizeof(buf2), _TRUNCATE, subFmt, (double)Num);
-							}
+							_snprintf_s(buf2, sizeof(buf2), _TRUNCATE, subFmt, Num);
 						}
 						else {
 							SetResult(3);