svnno****@sourc*****
svnno****@sourc*****
2015年 11月 16日 (月) 23:59:37 JST
Tera TermRevision: 6144
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6144
Author: maya
Date: 2015-11-16 23:59:37 +0900 (Mon, 16 Nov 2015)
Log Message:
-----------
About TTSSH を調整
項目の表示順を変更
MAC の表示形式を変更
Modified Paths:
--------------
trunk/installer/release/lang/English.lng
trunk/installer/release/lang/French.lng
trunk/installer/release/lang/German.lng
trunk/installer/release/lang/Japanese.lng
trunk/installer/release/lang/Korean.lng
trunk/installer/release/lang/Russian.lng
trunk/installer/release/lang/Simplified Chinese.lng
trunk/installer/release/lang/Traditional Chinese.lng
trunk/ttssh2/ttxssh/ssh.c
trunk/ttssh2/ttxssh/ssh.h
trunk/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2015-11-16 14:39:21 UTC (rev 6143)
+++ trunk/installer/release/lang/English.lng 2015-11-16 14:59:37 UTC (rev 6144)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Nov 15 2015)
+; Updated by TeraTerm Project (Nov 16 2015)
[Tera Term]
DLG_SYSTEM_FONT=System,14,0
@@ -518,8 +518,7 @@
DLG_ABOUT_KEX=Key exchange algorithm:
DLG_ABOUT_HOSTKEY=Host Key:
DLG_ABOUT_MAC=MAC algorithm:
-DLG_ABOUT_TOSERVER=" to server,"
-DLG_ABOUT_FROMSERVER=" from server"
+DLG_ABOUT_MAC_INFO=%s to server, %s from server
DLG_ABOUT_COMPDELAY=Delayed Compression:
DLG_ABOUT_CIPHER_INFO=%s to server, %s from server
DLG_ABOUT_KEY_INFO=%d-bit server key, %d-bit host key
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2015-11-16 14:39:21 UTC (rev 6143)
+++ trunk/installer/release/lang/French.lng 2015-11-16 14:59:37 UTC (rev 6144)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Nov 15 2015)
+; Updated by TeraTerm Project (Nov 16 2015)
; Last translated (French language) by Francois MOCQ (Jul 21 2010)
[Tera Term]
@@ -519,8 +519,7 @@
DLG_ABOUT_KEX=Key exchange algorithm:
DLG_ABOUT_HOSTKEY=Cl\xE9 de l'h\xF4te:
DLG_ABOUT_MAC=MAC algorithm:
-DLG_ABOUT_TOSERVER=" vers le serveur,"
-DLG_ABOUT_FROMSERVER=" depuis le serveur"
+DLG_ABOUT_MAC_INFO=%s vers le serveur, %s depuis le serveur
DLG_ABOUT_COMPDELAY=Compression retard\xE9e:
DLG_ABOUT_CIPHER_INFO=%s vers le serveur, %s depuis le server
DLG_ABOUT_KEY_INFO=%d-bit cl\xE9 serveur, %d-bit cl\xE9 h\xF4te
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2015-11-16 14:39:21 UTC (rev 6143)
+++ trunk/installer/release/lang/German.lng 2015-11-16 14:59:37 UTC (rev 6144)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Nov 15 2015)
+; Updated by TeraTerm Project (Nov 16 2015)
; Last translated (German language) by Frederik Schwarzer (May 17 2010)
[Tera Term]
@@ -519,8 +519,7 @@
DLG_ABOUT_KEX=Key exchange algorithm:
DLG_ABOUT_HOSTKEY=Client-Schl\xFCssel:
DLG_ABOUT_MAC=MAC algorithm:
-DLG_ABOUT_TOSERVER=" zum Server,"
-DLG_ABOUT_FROMSERVER=" vom Server"
+DLG_ABOUT_MAC_INFO=%s zum Server, %s vom Server
DLG_ABOUT_COMPDELAY=Delayed Compression:
DLG_ABOUT_CIPHER_INFO=%s zum Server, %s vom Server
DLG_ABOUT_KEY_INFO=%d-bit server key, %d-bit host key
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2015-11-16 14:39:21 UTC (rev 6143)
+++ trunk/installer/release/lang/Japanese.lng 2015-11-16 14:59:37 UTC (rev 6144)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Nov 15 2015)
+; Updated by TeraTerm Project (Nov 16 2015)
[Tera Term]
DLG_SYSTEM_FONT=\x82l\x82r \x82o\x83S\x83V\x83b\x83N,12,128
@@ -518,13 +518,12 @@
DLG_ABOUT_KEX=\x8C\xAE\x8C\xF0\x8A\xB7\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80:
DLG_ABOUT_HOSTKEY=\x83z\x83X\x83g\x8C\xAE:
DLG_ABOUT_MAC=MAC\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80:
-DLG_ABOUT_TOSERVER=" TTSSH\x81\xA8\x83T\x81[\x83o,"
-DLG_ABOUT_FROMSERVER=" \x83T\x81[\x83o\x81\xA8TTSSH"
+DLG_ABOUT_MAC_INFO=%s \x82ŃT\x81[\x83o\x82\xD6, %s \x82ŃT\x81[\x83o\x82\xA9\x82\xE7
DLG_ABOUT_COMPDELAY=\x92x\x89\x84\x88\xB3\x8Fk\x8F\xF3\x8B\xB5:
DLG_ABOUT_CIPHER_INFO=%s \x82ŃT\x81[\x83o\x82\xD6, %s \x82ŃT\x81[\x83o\x82\xA9\x82\xE7
-DLG_ABOUT_KEY_INFO=%d-bit server key, %d-bit host key
-DLG_ABOUT_KEY_INFO2=%d-bit client key, %d-bit server key
-DLG_ABOUT_KEY_NONE=None
+DLG_ABOUT_KEY_INFO=%d\x83r\x83b\x83g \x83T\x81[\x83o\x8C\xAE, %d\x83r\x83b\x83g \x83z\x83X\x83g\x8C\xAE
+DLG_ABOUT_KEY_INFO2=%d\x83r\x83b\x83g \x83N\x83\x89\x83C\x83A\x83\x93\x83g\x8C\xAE, %d\x83r\x83b\x83g \x83T\x81[\x83o\x8C\xAE
+DLG_ABOUT_KEY_NONE=\x82Ȃ\xB5
DLG_ABOUT_COMP_INFO=\x83\x8C\x83x\x83\x8B %d; \x88\xB3\x8Fk\x94\xE4 %.1f (%ld:%ld)
DLG_ABOUT_COMP_INFO2=\x83\x8C\x83x\x83\x8B %d
DLG_ABOUT_COMP_NONE=\x82Ȃ\xB5
Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng 2015-11-16 14:39:21 UTC (rev 6143)
+++ trunk/installer/release/lang/Korean.lng 2015-11-16 14:59:37 UTC (rev 6144)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Nov 15 2015)
+; Updated by TeraTerm Project (Nov 16 2015)
; Last translated (Korean language) by Daehong Kim (Jul 25 2013)
[Tera Term]
@@ -519,8 +519,7 @@
DLG_ABOUT_KEX=Key exchange algorithm:
DLG_ABOUT_HOSTKEY=ȣ\xBD\xBAƮ Ű:
DLG_ABOUT_MAC=MAC algorithm:
-DLG_ABOUT_TOSERVER=" \xBC\xAD\xB9\xF6\xB7\xCE,"
-DLG_ABOUT_FROMSERVER=" \xBC\xAD\xB9\xF6\xB7κ\xCE\xC5\xCD"
+DLG_ABOUT_MAC_INFO=%s to server, %s from server
DLG_ABOUT_COMPDELAY=\xC1\x{1BFB35}\xC8 \xBE\xD0\xC3\xE0:
DLG_ABOUT_CIPHER_INFO=%s\xB8\xA6 \xBC\xAD\xB9\xF6\xB7\xCE, %s\xB8\xA6 \xBC\xAD\xB9\xF6\xB7κ\xCE\xC5\xCD
DLG_ABOUT_KEY_INFO=%d-bit \xBC\xAD\xB9\xF6 Ű, %d-bit ȣ\xBD\xBAƮ Ű
Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng 2015-11-16 14:39:21 UTC (rev 6143)
+++ trunk/installer/release/lang/Russian.lng 2015-11-16 14:59:37 UTC (rev 6144)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Nov 15 2015)
+; Updated by TeraTerm Project (Nov 16 2015)
; Last translated (Russian language) by Ryumik Sergey (Mar 14 2015)
[Tera Term]
@@ -519,8 +519,7 @@
DLG_ABOUT_KEX=Key exchange algorithm:
DLG_ABOUT_HOSTKEY=\xCA\xEB\xFE\xF7 \xF5\xEE\xF1\xF2\xE0:
DLG_ABOUT_MAC=MAC algorithm:
-DLG_ABOUT_TOSERVER=" \xEA \xF1\xE5\xF0\xE2\xE5\xF0\xF3,"
-DLG_ABOUT_FROMSERVER=" \xEE\xF2 \xF1\xE5\xF0\xE2\xE5\xF0\xE0"
+DLG_ABOUT_MAC_INFO=%s \xEA \xF1\xE5\xF0\xE2\xE5\xF0\xF3, %s \xEE\xF2 \xF1\xE5\xF0\xE2\xE5\xF0\xE0
DLG_ABOUT_COMPDELAY=\xC7\xE0\xE4\xE5\xF0\xE6\xEA\xE0 \xF1\xE6\xE0\xF2\xE8\xFF:
DLG_ABOUT_CIPHER_INFO=%s \xEA \xF1\xE5\xF0\xE2\xE5\xF0\xF3, %s \xEE\xF2 \xF1\xE5\xF0\xE2\xE5\xF0\xE0
DLG_ABOUT_KEY_INFO=%d-\xE1\xE8\xF2 \xEA\xEB\xFE\xF7 \xF1\xE5\xF0\xE2\xE5\xF0\xE0, %d-\xE1\xE8\xF2 \xEA\xEB\xFE\xF7 \xF5\xEE\xF1\xF2\xE0
Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng 2015-11-16 14:39:21 UTC (rev 6143)
+++ trunk/installer/release/lang/Simplified Chinese.lng 2015-11-16 14:59:37 UTC (rev 6144)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Nov 15 2015)
+; Updated by TeraTerm Project (Nov 16 2015)
; Last translated (Simplified Chinese language) by LiShaohui (Nov 18 2013)
[Tera Term]
@@ -519,8 +519,7 @@
DLG_ABOUT_KEX=Key exchange algorithm:
DLG_ABOUT_HOSTKEY=\xD6\xF7\xBB\xFA\xC3\xDCԿ:
DLG_ABOUT_MAC=MAC algorithm:
-DLG_ABOUT_TOSERVER=" TTSSH\xA1\xFA\xB7\xFE\xCE\xF1\xC6\xF7,"
-DLG_ABOUT_FROMSERVER=" \xB7\xFE\xCE\xF1\xC6\xF7\xA1\xFATTSSH"
+DLG_ABOUT_MAC_INFO=%s \xB5\xBD\xB7\xFE\xCE\xF1\xC6\xF7\xA3\xAC%s \xC0\xB4\xD7Է\xFE\xCE\xF1\xC6\xF7
DLG_ABOUT_COMPDELAY=\xD1\xD3ʱѹ\xCB\xF5״\xBF\xF6:
DLG_ABOUT_CIPHER_INFO=%s \xB5\xBD\xB7\xFE\xCE\xF1\xC6\xF7\xA3\xAC%s \xC0\xB4\xD7Է\xFE\xCE\xF1\xC6\xF7
DLG_ABOUT_KEY_INFO=%d\xD7ֽڷ\xFE\xCE\xF1\xC6\xF7\xC3\xDCԿ\xA3\xAC%d\xD7ֽ\xDA\xD6\xF7\xBB\xFA\xC3\xDCԿ
Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng 2015-11-16 14:39:21 UTC (rev 6143)
+++ trunk/installer/release/lang/Traditional Chinese.lng 2015-11-16 14:59:37 UTC (rev 6144)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Nov 15 2015)
+; Updated by TeraTerm Project (Nov 16 2015)
; Traditional Chinese Language by kikiqqp (Sep 20 2014)
[Tera Term]
@@ -519,8 +519,7 @@
DLG_ABOUT_KEX=Key exchange algorithm:
DLG_ABOUT_HOSTKEY=\xA5D\xBE\xF7\xB1K\xC6_:
DLG_ABOUT_MAC=MAC algorithm:
-DLG_ABOUT_TOSERVER=" TTSSH\xA1\xF7\xA6\xF8\xAAA\xBE\xB9,"
-DLG_ABOUT_FROMSERVER=" \xA6\xF8\xAAA\xBE\xB9\xA1\xF7TTSSH"
+DLG_ABOUT_MAC_INFO=%s \xA8\xEC\xA6\xF8\xAAA\xBE\xB9\xA1A%s \xA8Ӧۦ\xF8\xAAA\xBE\xB9
DLG_ABOUT_COMPDELAY=\xA9\xB5\xAE\xC9\xC0\xA3\xC1Y\xAA\xAC\xAAp:
DLG_ABOUT_CIPHER_INFO=%s \xA8\xEC\xA6\xF8\xAAA\xBE\xB9\xA1A%s \xA8Ӧۦ\xF8\xAAA\xBE\xB9
DLG_ABOUT_KEY_INFO=%d\xA6r\xB8`\xA6\xF8\xAAA\xBE\xB9\xB1K\xC6_\xA1A%d\xA6r\xB8`\xA5D\xBE\xF7\xB1K\xC6_
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c 2015-11-16 14:39:21 UTC (rev 6143)
+++ trunk/ttssh2/ttxssh/ssh.c 2015-11-16 14:59:37 UTC (rev 6144)
@@ -3165,6 +3165,15 @@
}
}
+void SSH_get_mac_info(PTInstVar pvar, char FAR * dest, int len)
+{
+ UTIL_get_lang_msg("DLG_ABOUT_MAC_INFO", pvar,
+ "%s to server, %s from server");
+ _snprintf_s(dest, len, _TRUNCATE, pvar->ts->UIMsg,
+ get_ssh2_mac_name(pvar->ctos_hmac),
+ get_ssh2_mac_name(pvar->stoc_hmac));
+}
+
void SSH_end(PTInstVar pvar)
{
int i;
Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h 2015-11-16 14:39:21 UTC (rev 6143)
+++ trunk/ttssh2/ttxssh/ssh.h 2015-11-16 14:59:37 UTC (rev 6144)
@@ -667,6 +667,7 @@
void SSH_get_server_ID_info(PTInstVar pvar, char FAR * dest, int len);
void SSH_get_protocol_version_info(PTInstVar pvar, char FAR * dest, int len);
void SSH_get_compression_info(PTInstVar pvar, char FAR * dest, int len);
+void SSH_get_mac_info(PTInstVar pvar, char FAR * dest, int len);
/* len must be <= SSH_MAX_SEND_PACKET_SIZE */
void SSH_channel_send(PTInstVar pvar, int channel_num,
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2015-11-16 14:39:21 UTC (rev 6143)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2015-11-16 14:59:37 UTC (rev 6144)
@@ -2708,22 +2708,29 @@
strncat_s(buf2, sizeof(buf2), get_ssh_keytype_name(pvar->hostkey_type), _TRUNCATE);
strncat_s(buf2, sizeof(buf2), "\r\n", _TRUNCATE);
- UTIL_get_lang_msg("DLG_ABOUT_MAC", pvar, "MAC algorithm:");
+ UTIL_get_lang_msg("DLG_ABOUT_ENCRYPTION", pvar, "Encryption:");
strncat_s(buf2, sizeof(buf2), pvar->ts->UIMsg, _TRUNCATE);
strncat_s(buf2, sizeof(buf2), " ", _TRUNCATE);
- strncat_s(buf2, sizeof(buf2), get_ssh2_mac_name(pvar->ctos_hmac), _TRUNCATE);
- UTIL_get_lang_msg("DLG_ABOUT_TOSERVER", pvar, " to server,");
+ CRYPT_get_cipher_info(pvar, buf, sizeof(buf));
+ strncat_s(buf2, sizeof(buf2), buf, _TRUNCATE);
+ strncat_s(buf2, sizeof(buf2), "\r\n", _TRUNCATE);
+
+ UTIL_get_lang_msg("DLG_ABOUT_MAC", pvar, "MAC algorithm:");
strncat_s(buf2, sizeof(buf2), pvar->ts->UIMsg, _TRUNCATE);
strncat_s(buf2, sizeof(buf2), " ", _TRUNCATE);
- strncat_s(buf2, sizeof(buf2), get_ssh2_mac_name(pvar->stoc_hmac), _TRUNCATE);
- UTIL_get_lang_msg("DLG_ABOUT_FROMSERVER", pvar, " from server");
- strncat_s(buf2, sizeof(buf2), pvar->ts->UIMsg, _TRUNCATE);
+ SSH_get_mac_info(pvar, buf, sizeof(buf));
+ strncat_s(buf2, sizeof(buf2), buf, _TRUNCATE);
strncat_s(buf2, sizeof(buf2), "\r\n", _TRUNCATE);
- UTIL_get_lang_msg("DLG_ABOUT_ENCRYPTION", pvar, "Encryption:");
+ if (pvar->ctos_compression == COMP_DELAYED) { // \x92x\x89\x84\x83p\x83P\x83b\x83g\x88\xB3\x8Fk\x82̏ꍇ (2006.6.23 yutaka)
+ UTIL_get_lang_msg("DLG_ABOUT_COMPDELAY", pvar, "Delayed Compression:");
+ }
+ else {
+ UTIL_get_lang_msg("DLG_ABOUT_COMP", pvar, "Compression:");
+ }
strncat_s(buf2, sizeof(buf2), pvar->ts->UIMsg, _TRUNCATE);
strncat_s(buf2, sizeof(buf2), " ", _TRUNCATE);
- CRYPT_get_cipher_info(pvar, buf, sizeof(buf));
+ SSH_get_compression_info(pvar, buf, sizeof(buf));
strncat_s(buf2, sizeof(buf2), buf, _TRUNCATE);
strncat_s(buf2, sizeof(buf2), "\r\n", _TRUNCATE);
@@ -2740,17 +2747,6 @@
AUTH_get_auth_info(pvar, buf, sizeof(buf));
strncat_s(buf2, sizeof(buf2), buf, _TRUNCATE);
strncat_s(buf2, sizeof(buf2), "\r\n", _TRUNCATE);
-
- if (pvar->ctos_compression == COMP_DELAYED) { // \x92x\x89\x84\x83p\x83P\x83b\x83g\x88\xB3\x8Fk\x82̏ꍇ (2006.6.23 yutaka)
- UTIL_get_lang_msg("DLG_ABOUT_COMPDELAY", pvar, "Delayed Compression:");
- } else {
- UTIL_get_lang_msg("DLG_ABOUT_COMP", pvar, "Compression:");
- }
- strncat_s(buf2, sizeof(buf2), pvar->ts->UIMsg, _TRUNCATE);
- strncat_s(buf2, sizeof(buf2), " ", _TRUNCATE);
- SSH_get_compression_info(pvar, buf, sizeof(buf));
- strncat_s(buf2, sizeof(buf2), buf, _TRUNCATE);
- strncat_s(buf2, sizeof(buf2), "\r\n", _TRUNCATE);
}
// \x83z\x83X\x83g\x8C\xF6\x8AJ\x8C\xAE\x82\xCCfingerprint\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x81B