svnno****@sourc*****
svnno****@sourc*****
2015年 8月 29日 (土) 12:34:59 JST
Tera TermRevision: 5969
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5969
Author: maya
Date: 2015-08-29 12:34:59 +0900 (Sat, 29 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-29 02:55:41 UTC (rev 5968)
+++ trunk/installer/release/lang/English.lng 2015-08-29 03:34:59 UTC (rev 5969)
@@ -854,6 +854,8 @@
BTN_CLOSE=Close
BTN_DISCONNECT=&Disconnect
BTN_CONTINUE=&Continue
+BTN_YES=&Yes
+BTN_NO=&No
[TTProxy]
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2015-08-29 02:55:41 UTC (rev 5968)
+++ trunk/installer/release/lang/French.lng 2015-08-29 03:34:59 UTC (rev 5969)
@@ -854,6 +854,8 @@
BTN_CLOSE=Fermer
BTN_DISCONNECT=&D\xE9connecter
BTN_CONTINUE=&Continuer
+BTN_YES=&Yes
+BTN_NO=&No
[TTProxy]
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2015-08-29 02:55:41 UTC (rev 5968)
+++ trunk/installer/release/lang/German.lng 2015-08-29 03:34:59 UTC (rev 5969)
@@ -853,6 +853,8 @@
BTN_CLOSE=Schlie\xDFen
BTN_DISCONNECT=&Trennen
BTN_CONTINUE=&Fortsetzen
+BTN_YES=&Yes
+BTN_NO=&No
[TTProxy]
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2015-08-29 02:55:41 UTC (rev 5968)
+++ trunk/installer/release/lang/Japanese.lng 2015-08-29 03:34:59 UTC (rev 5969)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Aug 25 2015)
+; Updated by TeraTerm Project (Aug 29 2015)
[Tera Term]
DLG_SYSTEM_FONT=\x82l\x82r \x82o\x83S\x83V\x83b\x83N,12,128
@@ -854,6 +854,8 @@
BTN_CLOSE=\x95‚\xB6\x82\xE9(&C)
BTN_DISCONNECT=\x90ڑ\xB1\x92f(&D)
BTN_CONTINUE=\x91\xB1\x8Ds(&C)
+BTN_YES=\x82͂\xA2(&Y)
+BTN_NO=\x82\xA2\x82\xA2\x82\xA6(&N)
[TTProxy]
Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng 2015-08-29 02:55:41 UTC (rev 5968)
+++ trunk/installer/release/lang/Korean.lng 2015-08-29 03:34:59 UTC (rev 5969)
@@ -855,6 +855,8 @@
BTN_CLOSE=\xB4ݱ\xE2
BTN_DISCONNECT=\xBF\xAC\xB0\xE1\xB2\xF7\xC0\xBD(&D)
BTN_CONTINUE=\xB0\xE8\xBC\xD3(&C)
+BTN_YES=&Yes
+BTN_NO=&No
[TTProxy]
Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng 2015-08-29 02:55:41 UTC (rev 5968)
+++ trunk/installer/release/lang/Russian.lng 2015-08-29 03:34:59 UTC (rev 5969)
@@ -855,6 +855,8 @@
BTN_CLOSE=\xC7\xE0\xEA\xF0\xFB\xF2\xFC
BTN_DISCONNECT=&\xD0\xE0\xE7\xFA\xE5\xE4\xE8\xED\xE5\xED\xE8\xE5
BTN_CONTINUE=&\xCF\xF0\xEE\xE4\xEE\xEB\xE6\xE5\xED\xE8\xE5
+BTN_YES=&Yes
+BTN_NO=&No
[TTProxy]
Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng 2015-08-29 02:55:41 UTC (rev 5968)
+++ trunk/installer/release/lang/Simplified Chinese.lng 2015-08-29 03:34:59 UTC (rev 5969)
@@ -855,6 +855,8 @@
BTN_CLOSE=\xB9ر\xD5
BTN_DISCONNECT=\xB6Ͽ\xAA\xC1\xAC\xBD\xD3(&D)
BTN_CONTINUE=\xBC\xCC\xD0\xF8(&C)
+BTN_YES=&Yes
+BTN_NO=&No
[TTProxy]
Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng 2015-08-29 02:55:41 UTC (rev 5968)
+++ trunk/installer/release/lang/Traditional Chinese.lng 2015-08-29 03:34:59 UTC (rev 5969)
@@ -855,6 +855,8 @@
BTN_CLOSE=\xC3\xF6\xB3\xAC
BTN_DISCONNECT=\xA4\xA4\xC2_\xB3s\xB1\xB5(&D)
BTN_CONTINUE=\xC4~\xC4\xF2(&C)
+BTN_YES=&Yes
+BTN_NO=&No
[TTProxy]
Modified: trunk/ttssh2/ttxssh/key.c
===================================================================
--- trunk/ttssh2/ttxssh/key.c 2015-08-29 02:55:41 UTC (rev 5968)
+++ trunk/ttssh2/ttxssh/key.c 2015-08-29 03:34:59 UTC (rev 5969)
@@ -1979,6 +1979,13 @@
free(fp);
}
+ GetDlgItemText(dlg, IDOK, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("BTN_YES", pvar, uimsg);
+ SetDlgItemText(dlg, IDOK, pvar->ts->UIMsg);
+ GetDlgItemText(dlg, IDCANCEL, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("BTN_NO", pvar, uimsg);
+ SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
+
font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
GetObject(font, sizeof(LOGFONT), &logfont);
if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgHostsAddFont, pvar)) {
@@ -1987,8 +1994,8 @@
SendDlgItemMessage(dlg, IDC_ADDKEY_EDIT, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
SendDlgItemMessage(dlg, IDC_REMOVEKEY_TEXT, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
- //SendDlgItemMessage(dlg, IDOK, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
- //SendDlgItemMessage(dlg, IDCANCEL, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(dlg, IDOK, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(dlg, IDCANCEL, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
}
else {
DlgHostsAddFont = NULL;
Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc 2015-08-29 02:55:41 UTC (rev 5968)
+++ trunk/ttssh2/ttxssh/ttxssh.rc 2015-08-29 03:34:59 UTC (rev 5969)
@@ -16,8 +16,10 @@
// \x89p\x8C\xEA (\x95č\x91) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
+#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
@@ -399,18 +401,18 @@
EDITTEXT IDC_SFTP_CONSOLE,7,33,252,110,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
END
-IDD_SSHUPDATE_HOSTKEY DIALOGEX 0, 0, 309, 256
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_SSHUPDATE_HOSTKEY DIALOGEX 0, 0, 309, 216
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Hostkey rotation"
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
- PUSHBUTTON "&YES",IDOK,87,233,50,14
- DEFPUSHBUTTON "&NO",IDCANCEL,159,233,50,14
- LTEXT "You received the list of host keys from remote server `%s'.\nYou can choose to add %u new key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nAre you sure that 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 "%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
+ LTEXT "You received the list of host keys from remote server `%s'.\nYou can choose to add %u new key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nAre you sure that you want to update known hosts file?",IDC_HOSTKEY_MESSAGE,15,7,280,45
+ LTEXT "%u new key(s):",IDC_ADDKEY_TEXT,7,66,295,8
+ EDITTEXT IDC_ADDKEY_EDIT,7,78,295,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
+ LTEXT "%u obsolete key(s):",IDC_REMOVEKEY_TEXT,7,130,295,8
+ EDITTEXT IDC_REMOVEKEY_EDIT,7,142,295,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
+ PUSHBUTTON "&Yes",IDOK,93,193,50,14
+ DEFPUSHBUTTON "&No",IDCANCEL,165,193,50,14
END
@@ -420,7 +422,7 @@
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
IDD_ABOUTDIALOG, DIALOG
BEGIN
@@ -554,7 +556,7 @@
LEFTMARGIN, 7
RIGHTMARGIN, 302
TOPMARGIN, 7
- BOTTOMMARGIN, 247
+ BOTTOMMARGIN, 207
END
END
#endif // APSTUDIO_INVOKED