svnno****@sourc*****
svnno****@sourc*****
2015年 8月 28日 (金) 23:44:28 JST
Tera TermRevision: 5964
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5964
Author: maya
Date: 2015-08-28 23:44:28 +0900 (Fri, 28 Aug 2015)
Log Message:
-----------
サーバホスト鍵更新のメッセージを修正
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/key.c
trunk/ttssh2/ttxssh/ttxssh.rc
-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2015-08-28 13:22:00 UTC (rev 5963)
+++ trunk/installer/release/lang/English.lng 2015-08-28 14:44:28 UTC (rev 5964)
@@ -733,7 +733,10 @@
DLG_HOSTKEY_DNSSEC_NG=Found insecure fingerprint in DNS.
DLG_HOSTKEY_DNSSEC_OK=Found secure fingerprint in DNS.
-DLG_HOSTKEY_ROTATION_WARNING=Remote server "%s" sent the set of host keys which are absent in your list of known hosts. \nThe machine you have contacted may be a hostile machine pretending to be the server, or legitimate server supporting host key rotation. \n\nIf you choose to add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list and continue, then you will not receive this warning again.\n\nDo you want to update known hosts file with new key(s)?\n\n
+DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
+DLG_HOSTKEY_ROTATION_WARNING=Received the set of host keys from remote server `%s'.\nIf you choose yes, add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nDo you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
+DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
; crypt.c
MSG_ENCRYPT_ERROR1=%s encrypt error(1): bytes %d (%d)
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2015-08-28 13:22:00 UTC (rev 5963)
+++ trunk/installer/release/lang/French.lng 2015-08-28 14:44:28 UTC (rev 5964)
@@ -733,7 +733,10 @@
DLG_HOSTKEY_DNSSEC_NG=Found insecure fingerprint in DNS.
DLG_HOSTKEY_DNSSEC_OK=Found secure fingerprint in DNS.
-DLG_HOSTKEY_ROTATION_WARNING=Remote server "%s" sent the set of host keys which are absent in your list of known hosts. \nThe machine you have contacted may be a hostile machine pretending to be the server, or legitimate server supporting host key rotation. \n\nIf you choose to add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list and continue, then you will not receive this warning again.\n\nDo you want to update known hosts file with new key(s)?\n\n
+DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
+DLG_HOSTKEY_ROTATION_WARNING=Received the set of host keys from remote server `%s'.\nIf you choose yes, add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nDo you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
+DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
; crypt.c
MSG_ENCRYPT_ERROR1=%s erreur cryptage(1): octets %d (%d)
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2015-08-28 13:22:00 UTC (rev 5963)
+++ trunk/installer/release/lang/German.lng 2015-08-28 14:44:28 UTC (rev 5964)
@@ -732,7 +732,10 @@
DLG_HOSTKEY_DNSSEC_NG=Found insecure fingerprint in DNS.
DLG_HOSTKEY_DNSSEC_OK=Found secure fingerprint in DNS.
-DLG_HOSTKEY_ROTATION_WARNING=Remote server "%s" sent the set of host keys which are absent in your list of known hosts. \nThe machine you have contacted may be a hostile machine pretending to be the server, or legitimate server supporting host key rotation. \n\nIf you choose to add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list and continue, then you will not receive this warning again.\n\nDo you want to update known hosts file with new key(s)?\n\n
+DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
+DLG_HOSTKEY_ROTATION_WARNING=Received the set of host keys from remote server `%s'.\nIf you choose yes, add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nDo you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
+DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
; crypt.c
MSG_ENCRYPT_ERROR1=%s encrypt error(1): bytes %d (%d)
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2015-08-28 13:22:00 UTC (rev 5963)
+++ trunk/installer/release/lang/Japanese.lng 2015-08-28 14:44:28 UTC (rev 5964)
@@ -733,7 +733,10 @@
DLG_HOSTKEY_DNSSEC_NG=DNS\x82̌\xAE\x8Ew\x96\xE4\x8F\xEE\x95\xF1\x82\xCDDNSSEC\x82ŔF\x8F\xB3\x82\xEA\x82\xC4*\x82\xA2\x82܂\xB9\x82\xF1*\x81B
DLG_HOSTKEY_DNSSEC_OK=DNS\x82̌\xAE\x8Ew\x96\xE4\x8F\xEE\x95\xF1\x82\xCDDNSSEC\x82ŔF\x8F\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B
-DLG_HOSTKEY_ROTATION_WARNING=\x90ڑ\xB1\x90\xE6\x82̃T\x81[\x83o"%s"\x82\xAA, \x83T\x81[\x83o\x83z\x83X\x83g\x8C\xAE\x82̎\xA9\x93\xAE\x8DX\x90V\x8B@\x94\\x82𗘗p\x82\xB5\x82\xC4, known hosts\x83\x8A\x83X\x83g\x82ɑ\xB6\x8D݂\xB5\x82Ȃ\xA2\x83z\x83X\x83g\x8C\xAE\x82𑗕t\x82\xB5\x82Ă\xAB\x82܂\xB5\x82\xBD.\n\x88\xAB\x88ӂ\xF0\x8E\x9D\x82\xC1\x82\xBD\x83z\x83X\x83g\x82\xAA, \x90ڑ\xB1\x82\xB5\x82悤\x82Ƃ\xB5\x82Ă\xA2\x82\xE9\x83T\x81[\x83o\x82̂ӂ\xE8\x82\xF0\x82\xB5\x82Ă\xA2\x82\xE9\x89”\\x90\xAB\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x82̂\xC5, \x8F\\x95\xAA\x92\x8D\x88ӂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2. \n\n\x8E\xA9\x93\xAE\x8DX\x90V\x82\xF0\x8B\x96\x89‚\xB7\x82\xE9\x82\xC6, %u\x8C‚̍ŐV\x83z\x83X\x83g\x8C\xAE\x82̒lj\xC1\x82\xA8\x82\xE6\x82\xD1%u\x8C‚̋\x8C\x8E\xAE\x83z\x83X\x83g\x8C\xAE\x82̍폜\x82\xF0\x8Ds\x82\xA2, \x8E\x9F\x89炱\x82̌x\x8D\x90\x82͏o\x82Ȃ\xAD\x82Ȃ\xE8\x82܂\xB7.\n\nknown hosts\x83\x8A\x83X\x83g\x82\xF0\x8DX\x90V\x82\xB5\x82܂\xB7\x82\xA9?\n\n
+DLG_HOSTKEY_ROTATION_TITLE=\x83T\x81[\x83o\x83z\x83X\x83g\x8C\xAE\x82̍X\x90V
+DLG_HOSTKEY_ROTATION_WARNING=\x90ڑ\xB1\x90\xE6\x82̃T\x81[\x83o`%s'\x82\xA9\x82\xE7\x83z\x83X\x83g\x8C\xAE\x88ꗗ\x82\xF0\x8E\xF3\x90M\x82\xB5\x82܂\xB5\x82\xBD.\n\x8DX\x90V\x82\xB7\x82\xE9\x82\xC6, known hosts\x83\x8A\x83X\x83g\x82\xC9%u\x8C‚̐V\x82\xB5\x82\xA2\x83z\x83X\x83g\x8C\xAE\x82\xF0\x92lj\xC1\x82\xB5\x81A%u\x8C‚̔p\x8E~\x82\xB3\x82ꂽ\x83z\x83X\x83g\x8C\xAE\x82\xF0\x8D폜\x82\xB5\x82܂\xB7.\nknown hosts\x83\x8A\x83X\x83g\x82\xF0\x8DX\x90V\x82\xB5\x82܂\xB7\x82\xA9?
+DLG_HOSTKEY_ROTATION_ADD=%u\x8C‚̐V\x82\xB5\x82\xA2\x83z\x83X\x83g\x8C\xAE:
+DLG_HOSTKEY_ROTATION_REMOVE=%u\x8C‚̔p\x8E~\x82\xB3\x82ꂽ\x83z\x83X\x83g\x8C\xAE:
; crypt.c
MSG_ENCRYPT_ERROR1=%s\x88Í\x86\x89\xBB\x83G\x83\x89\x81[(1): bytes %d (%d)
Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng 2015-08-28 13:22:00 UTC (rev 5963)
+++ trunk/installer/release/lang/Korean.lng 2015-08-28 14:44:28 UTC (rev 5964)
@@ -734,7 +734,10 @@
DLG_HOSTKEY_DNSSEC_NG=DNS\xBF\xA1\xBC\xAD \xBE\xC8\xC0\xFC\xC7\xCF\xC1\xF6 \xBE\xCA\xC0\xBA \xC1\xF6\xB9\xAE \xB9߰\xDF.
DLG_HOSTKEY_DNSSEC_OK=DNS\xBF\xA1\xBC\xAD \xBE\xC8\xC0\xFC\xC7\xD1 \xC1\xF6\xB9\xAE \xB9߰\xDF.
-DLG_HOSTKEY_ROTATION_WARNING=Remote server "%s" sent the set of host keys which are absent in your list of known hosts. \nThe machine you have contacted may be a hostile machine pretending to be the server, or legitimate server supporting host key rotation. \n\nIf you choose to add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list and continue, then you will not receive this warning again.\n\nDo you want to update known hosts file with new key(s)?\n\n
+DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
+DLG_HOSTKEY_ROTATION_WARNING=Received the set of host keys from remote server `%s'.\nIf you choose yes, add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nDo you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
+DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
; crypt.c
MSG_ENCRYPT_ERROR1=%s \xBE\xCFȣ \xBF\xC0\xB7\xF9(1): \xB9\xD9\xC0\xCCƮ %d (%d)
Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng 2015-08-28 13:22:00 UTC (rev 5963)
+++ trunk/installer/release/lang/Russian.lng 2015-08-28 14:44:28 UTC (rev 5964)
@@ -734,7 +734,10 @@
DLG_HOSTKEY_DNSSEC_NG=\xCD\xE0\xE9\xE4\xE5\xED \xED\xE5\xED\xE0\xE4\xE5\xE6\xED\xFB\xE9 \xEF\xE0\xF0\xEE\xEB\xFC \xE2 DNS.
DLG_HOSTKEY_DNSSEC_OK=\xCD\xE0\xE9\xE4\xE5\xED \xED\xE0\xE4\xE5\xE6\xED\xFB\xE9 \xEF\xE0\xF0\xEE\xEB\xFC \xE2 DNS.
-DLG_HOSTKEY_ROTATION_WARNING=Remote server "%s" sent the set of host keys which are absent in your list of known hosts. \nThe machine you have contacted may be a hostile machine pretending to be the server, or legitimate server supporting host key rotation. \n\nIf you choose to add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list and continue, then you will not receive this warning again.\n\nDo you want to update known hosts file with new key(s)?\n\n
+DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
+DLG_HOSTKEY_ROTATION_WARNING=Received the set of host keys from remote server `%s'.\nIf you choose yes, add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nDo you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
+DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
; crypt.c
MSG_ENCRYPT_ERROR1=%s \xEE\xF8\xE8\xE1\xEA\xE0 \xF8\xE8\xF4\xF0\xEE\xE2\xE0\xED\xE8\xFF(1): \xE1\xE0\xE9\xF2\xFB %d (%d)
Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng 2015-08-28 13:22:00 UTC (rev 5963)
+++ trunk/installer/release/lang/Simplified Chinese.lng 2015-08-28 14:44:28 UTC (rev 5964)
@@ -734,7 +734,10 @@
DLG_HOSTKEY_DNSSEC_NG=DNS\xD6з\xA2\xCF\xD6\xC8\xF5\xC3\xDC\xC2롣
DLG_HOSTKEY_DNSSEC_OK=DNS\xD6з\xA2\xCF\xD6ǿ\xC3\xDC\xC2롣
-DLG_HOSTKEY_ROTATION_WARNING=Remote server "%s" sent the set of host keys which are absent in your list of known hosts. \nThe machine you have contacted may be a hostile machine pretending to be the server, or legitimate server supporting host key rotation. \n\nIf you choose to add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list and continue, then you will not receive this warning again.\n\nDo you want to update known hosts file with new key(s)?\n\n
+DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
+DLG_HOSTKEY_ROTATION_WARNING=Received the set of host keys from remote server `%s'.\nIf you choose yes, add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nDo you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
+DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
; crypt.c
MSG_ENCRYPT_ERROR1=%s\xBC\xD3\xC3ܴ\xED\xCE\xF3(1): bytes %d (%d)
Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng 2015-08-28 13:22:00 UTC (rev 5963)
+++ trunk/installer/release/lang/Traditional Chinese.lng 2015-08-28 14:44:28 UTC (rev 5964)
@@ -734,7 +734,10 @@
DLG_HOSTKEY_DNSSEC_NG=DNS\xA4\xA4\xB5o\xB2{\xAEz\xB1K\xBDX\xA1C
DLG_HOSTKEY_DNSSEC_OK=DNS\xA4\xA4\xB5o\xB2{\xB1j\xB1K\xBDX\xA1C
-DLG_HOSTKEY_ROTATION_WARNING=Remote server "%s" sent the set of host keys which are absent in your list of known hosts. \nThe machine you have contacted may be a hostile machine pretending to be the server, or legitimate server supporting host key rotation. \n\nIf you choose to add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list and continue, then you will not receive this warning again.\n\nDo you want to update known hosts file with new key(s)?\n\n
+DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
+DLG_HOSTKEY_ROTATION_WARNING=Received the set of host keys from remote server `%s'.\nIf you choose yes, add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nDo you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
+DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
; crypt.c
MSG_ENCRYPT_ERROR1=%s\xA5[\xB1K\xBF\xF9\xBB~(1): bytes %d (%d)
Modified: trunk/ttssh2/ttxssh/key.c
===================================================================
--- trunk/ttssh2/ttxssh/key.c 2015-08-28 13:22:00 UTC (rev 5963)
+++ trunk/ttssh2/ttxssh/key.c 2015-08-28 14:44:28 UTC (rev 5964)
@@ -1926,27 +1926,30 @@
struct hostkeys_update_ctx *ctx;
char *fp;
size_t i;
+ char uimsg[MAX_UIMSG];
switch (msg) {
case WM_INITDIALOG:
pvar = (PTInstVar)lParam;
SetWindowLong(dlg, DWL_USER, lParam);
+ GetWindowText(dlg, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("DLG_HOSTKEY_ROTATION_TITLE", pvar, uimsg);
+ SetWindowText(dlg, pvar->ts->UIMsg);
+
host = pvar->ssh_state.hostname;
ctx = pvar->hostkey_ctx;
-
- UTIL_get_lang_msg("DLG_HOSTKEY_ROTATION_WARNING", pvar,
- "Remote server \"%s\" sent the set of host keys which are absent in your list of known hosts. \n"
- "The machine you have contacted may be a hostile machine pretending to be the server, or legitimate server supporting host key rotation. \n\n"
- "If you choose to add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list and continue, then you will not receive this warning again.\n\n"
- "Do you want to update known hosts file with new key(s)?\n\n"
- );
+
+ GetDlgItemText(dlg, IDC_HOSTKEY_MESSAGE, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("DLG_HOSTKEY_ROTATION_WARNING", pvar, uimsg);
_snprintf_s(buf, sizeof(buf), _TRUNCATE,
pvar->ts->UIMsg, host, ctx->nnew, ctx->nold
);
SetDlgItemText(dlg, IDC_HOSTKEY_MESSAGE, buf);
- _snprintf_s(buf, sizeof(buf), _TRUNCATE, "%u latest key(s):\n", ctx->nnew);
+ GetDlgItemText(dlg, IDC_ADDKEY_TEXT, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("DLG_HOSTKEY_ROTATION_ADD", pvar, uimsg);
+ _snprintf_s(buf, sizeof(buf), _TRUNCATE, pvar->ts->UIMsg, ctx->nnew);
SetDlgItemText(dlg, IDC_ADDKEY_TEXT, buf);
for (i = 0; i < ctx->nkeys; i++) {
if (ctx->keys_seen[i])
@@ -1961,7 +1964,9 @@
free(fp);
}
- _snprintf_s(buf, sizeof(buf), _TRUNCATE, "%u obsolete key(s):\n", ctx->nold);
+ GetDlgItemText(dlg, IDC_REMOVEKEY_TEXT, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("DLG_HOSTKEY_ROTATION_REMOVE", pvar, uimsg);
+ _snprintf_s(buf, sizeof(buf), _TRUNCATE, pvar->ts->UIMsg, ctx->nold);
SetDlgItemText(dlg, IDC_REMOVEKEY_TEXT, buf);
for (i = 0; i < ctx->nold; i++) {
fp = key_fingerprint(ctx->old_keys[i], SSH_FP_HEX);
Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc 2015-08-28 13:22:00 UTC (rev 5963)
+++ trunk/ttssh2/ttxssh/ttxssh.rc 2015-08-28 14:44:28 UTC (rev 5964)
@@ -401,15 +401,15 @@
IDD_SSHUPDATE_HOSTKEY DIALOGEX 0, 0, 309, 256
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "SECURITY WARNING"
+CAPTION "Hostkey rotation"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
PUSHBUTTON "&YES",IDOK,87,233,50,14
DEFPUSHBUTTON "&NO",IDCANCEL,159,233,50,14
- LTEXT "#####",IDC_HOSTKEY_MESSAGE,7,16,295,85
- LTEXT "latest key(s):",IDC_ADDKEY_TEXT,7,106,139,8
+ LTEXT "Received the set of host keys from remote server `%s'.\nIf you choose yes, add %u latest key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nDo you want to update known hosts file?",IDC_HOSTKEY_MESSAGE,7,16,295,85
+ LTEXT "%u new key(s):",IDC_ADDKEY_TEXT,7,106,139,8
EDITTEXT IDC_ADDKEY_EDIT,7,118,295,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
- LTEXT "obsolete key(s):",IDC_REMOVEKEY_TEXT,7,170,130,8
+ LTEXT "%u obsolete key(s):",IDC_REMOVEKEY_TEXT,7,170,130,8
EDITTEXT IDC_REMOVEKEY_EDIT,7,183,295,43,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
END