svnno****@sourc*****
svnno****@sourc*****
2011年 2月 23日 (水) 23:42:38 JST
Revision: 4330 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4330 Author: maya Date: 2011-02-23 23:42:38 +0900 (Wed, 23 Feb 2011) 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/ttssh2/ttxssh/hosts.c trunk/ttssh2/ttxssh/resource.h trunk/ttssh2/ttxssh/ttxssh.c trunk/ttssh2/ttxssh/ttxssh.h trunk/ttssh2/ttxssh/ttxssh.rc -------------- next part -------------- Modified: trunk/installer/release/lang/English.lng =================================================================== --- trunk/installer/release/lang/English.lng 2011-02-22 09:44:56 UTC (rev 4329) +++ trunk/installer/release/lang/English.lng 2011-02-23 14:42:38 UTC (rev 4330) @@ -518,11 +518,11 @@ MSG_NOAUTHMETHOD_ERROR=Server does not support any of the authentication options\nprovided by TTSSH. This connection will now close. ; dlg diff host -DLG_DIFFERENTHOST_TITLE=SECURITY WARNING -DLG_DIFFERENTHOST_WARNING=Your known hosts list has an entry for the server "####################################", but the machine you have contacted has presented a DIFFERENT KEY to the one in your known hosts list. A hostile machine may be pretending to be the server. -DLG_DIFFERENTHOST_WARNING2=If you choose to add this new key to the known hosts list and continue, then you will not receive this warning again. -DLG_DIFFERENTHOST_FINGERPRINT=The server's host key fingerprint is: -DLG_DIFFERENTHOST_REPLACE=&Replace the exist key with this new key +DLG_DIFFERENTKEY_TITLE=SECURITY WARNING +DLG_DIFFERENTKEY_WARNING=Your known hosts list has an entry for the server "####################################", but the machine you have contacted has presented a DIFFERENT KEY to the one in your known hosts list. A hostile machine may be pretending to be the server. +DLG_DIFFERENTKEY_WARNING2=If you choose to add this new key to the known hosts list and continue, then you will not receive this warning again. +DLG_DIFFERENTKEY_FINGERPRINT=The server's host key fingerprint is: +DLG_DIFFERENTKEY_REPLACE=&Replace the exist key with this new key ; dlg fwd edit DLG_FWD_TITLE=SSH Port Forwarding Modified: trunk/installer/release/lang/French.lng =================================================================== --- trunk/installer/release/lang/French.lng 2011-02-22 09:44:56 UTC (rev 4329) +++ trunk/installer/release/lang/French.lng 2011-02-23 14:42:38 UTC (rev 4330) @@ -517,11 +517,11 @@ MSG_NOAUTHMETHOD_ERROR=Le serveur ne supporte aucune des options d'authentification\nfournies par TTSSH. Cette connexion va maintenant être fermée. ; dlg diff host -DLG_DIFFERENTHOST_TITLE=ALERTE DE SECURITE -DLG_DIFFERENTHOST_WARNING=Votre liste d'hôte connus a une entrée pour le serveur "####################################", mais la machine contactée a présenté une CLE DIFFERENTE ! Une machine hostile pourrait se faire passer pour le serveur. -DLG_DIFFERENTHOST_WARNING2=Si vous choisissez d'ajouter la nouvelle clé à votre liste et de continuer, vous ne recevrez plus cet avertissement. -DLG_DIFFERENTHOST_FINGERPRINT=L'empreinte de la clé du serveur est: -DLG_DIFFERENTHOST_REPLACE=&Remplacer la clé actuelle avec cette nouvelle clé +DLG_DIFFERENTKEY_TITLE=ALERTE DE SECURITE +DLG_DIFFERENTKEY_WARNING=Votre liste d'hôte connus a une entrée pour le serveur "####################################", mais la machine contactée a présenté une CLE DIFFERENTE ! Une machine hostile pourrait se faire passer pour le serveur. +DLG_DIFFERENTKEY_WARNING2=Si vous choisissez d'ajouter la nouvelle clé à votre liste et de continuer, vous ne recevrez plus cet avertissement. +DLG_DIFFERENTKEY_FINGERPRINT=L'empreinte de la clé du serveur est: +DLG_DIFFERENTKEY_REPLACE=&Remplacer la clé actuelle avec cette nouvelle clé ; dlg fwd edit DLG_FWD_TITLE=SSH Mappage de port Modified: trunk/installer/release/lang/German.lng =================================================================== --- trunk/installer/release/lang/German.lng 2011-02-22 09:44:56 UTC (rev 4329) +++ trunk/installer/release/lang/German.lng 2011-02-23 14:42:38 UTC (rev 4330) @@ -516,11 +516,11 @@ MSG_NOAUTHMETHOD_ERROR=Der Server unterstützt keine der von TTSSH angebotenen\nAuthentifizierungs-Optionen. Die Verbindung wird beendet. ; dlg diff host -DLG_DIFFERENTHOST_TITLE=SICHERHEITSWARNUNG -DLG_DIFFERENTHOST_WARNING=Der Server ("####################################") ist in der "known hosts"-Liste bereits mit einem anderen Schlüssel eingetragen. -DLG_DIFFERENTHOST_WARNING2=Wenn Sie auf 'Continue' klicken, wird der Server in die Liste aufgenommen und die Fehlermeldung erscheint nicht mehr. -DLG_DIFFERENTHOST_FINGERPRINT=Der Fingerabdruck des Schlüssels: -DLG_DIFFERENTHOST_REPLACE=Den vorhanden Schlüssel durch den neuen ersetzen. +DLG_DIFFERENTKEY_TITLE=SICHERHEITSWARNUNG +DLG_DIFFERENTKEY_WARNING=Der Server ("####################################") ist in der "known hosts"-Liste bereits mit einem anderen Schlüssel eingetragen. +DLG_DIFFERENTKEY_WARNING2=Wenn Sie auf 'Continue' klicken, wird der Server in die Liste aufgenommen und die Fehlermeldung erscheint nicht mehr. +DLG_DIFFERENTKEY_FINGERPRINT=Der Fingerabdruck des Schlüssels: +DLG_DIFFERENTKEY_REPLACE=Den vorhanden Schlüssel durch den neuen ersetzen. ; dlg fwd edit DLG_FWD_TITLE=SSH-Port-Weiterleitung Modified: trunk/installer/release/lang/Japanese.lng =================================================================== --- trunk/installer/release/lang/Japanese.lng 2011-02-22 09:44:56 UTC (rev 4329) +++ trunk/installer/release/lang/Japanese.lng 2011-02-23 14:42:38 UTC (rev 4330) @@ -518,11 +518,11 @@ MSG_NOAUTHMETHOD_ERROR=T[oÍTTSSH ªñ·éFØIvVðT|[gµÄ¢Ü¹ñ.\nڱͶçêÜ·. ; dlg diff host -DLG_DIFFERENTHOST_TITLE=ZL eBx -DLG_DIFFERENTHOST_WARNING=knows hostsXgÌT[o"####################################"ÌGgÆ, Ú±æÌzXg®ª *êvµÄ¢Ü¹ñ* «ÓðÁ½zXgª, Ú±µæ¤ÆµÄ¢éT[oÌÓèðµÄ¢éÂ\«à èÜ·ÌÅ, \ªÓµÄ¾³¢. -DLG_DIFFERENTHOST_WARNING2=known hostsXgɱÌzXgðÇÁµÄ±s·éÆ, ñ©ç±ÌxÍoÈÈèÜ·. -DLG_DIFFERENTHOST_FINGERPRINT=T[o¤ÌzXg®wä: -DLG_DIFFERENTHOST_REPLACE=ù¶Ì®ð, Vµ¢®Åã«·é(&R) +DLG_DIFFERENTKEY_TITLE=ZL eBx +DLG_DIFFERENTKEY_WARNING=knows hostsXgÌT[o"####################################"ÌGgÆ, Ú±æÌzXg®ª *êvµÄ¢Ü¹ñ* «ÓðÁ½zXgª, Ú±µæ¤ÆµÄ¢éT[oÌÓèðµÄ¢éÂ\«à èÜ·ÌÅ, \ªÓµÄ¾³¢. +DLG_DIFFERENTKEY_WARNING2=known hostsXgɱÌzXgðÇÁµÄ±s·éÆ, ñ©ç±ÌxÍoÈÈèÜ·. +DLG_DIFFERENTKEY_FINGERPRINT=T[o¤ÌzXg®wä: +DLG_DIFFERENTKEY_REPLACE=ù¶Ì®ð, Vµ¢®Åã«·é(&R) ; dlg fwd edit DLG_FWD_TITLE=SSH|[g] Modified: trunk/ttssh2/ttxssh/hosts.c =================================================================== --- trunk/ttssh2/ttxssh/hosts.c 2011-02-22 09:44:56 UTC (rev 4329) +++ trunk/ttssh2/ttxssh/hosts.c 2011-02-23 14:42:38 UTC (rev 4330) @@ -1410,19 +1410,19 @@ // ÇÁEu«·¦Æà init_hosts_dlg ðÄñÅ¢éÌÅA»ÌOÉZbg·éKvª é GetWindowText(dlg, uimsg, sizeof(uimsg)); - UTIL_get_lang_msg("DLG_DIFFERENTHOST_TITLE", pvar, uimsg); + UTIL_get_lang_msg("DLG_DIFFERENTKEY_TITLE", pvar, uimsg); SetWindowText(dlg, pvar->ts->UIMsg); GetDlgItemText(dlg, IDC_HOSTWARNING, uimsg, sizeof(uimsg)); - UTIL_get_lang_msg("DLG_DIFFERENTHOST_WARNING", pvar, uimsg); + UTIL_get_lang_msg("DLG_DIFFERENTKEY_WARNING", pvar, uimsg); SetDlgItemText(dlg, IDC_HOSTWARNING, pvar->ts->UIMsg); GetDlgItemText(dlg, IDC_HOSTWARNING2, uimsg, sizeof(uimsg)); - UTIL_get_lang_msg("DLG_DIFFERENTHOST_WARNING2", pvar, uimsg); + UTIL_get_lang_msg("DLG_DIFFERENTKEY_WARNING2", pvar, uimsg); SetDlgItemText(dlg, IDC_HOSTWARNING2, pvar->ts->UIMsg); GetDlgItemText(dlg, IDC_HOSTFINGERPRINT, uimsg, sizeof(uimsg)); - UTIL_get_lang_msg("DLG_DIFFERENTHOST_FINGERPRINT", pvar, uimsg); + UTIL_get_lang_msg("DLG_DIFFERENTKEY_FINGERPRINT", pvar, uimsg); SetDlgItemText(dlg, IDC_HOSTFINGERPRINT, pvar->ts->UIMsg); GetDlgItemText(dlg, IDC_ADDTOKNOWNHOSTS, uimsg, sizeof(uimsg)); - UTIL_get_lang_msg("DLG_DIFFERENTHOST_REPLACE", pvar, uimsg); + UTIL_get_lang_msg("DLG_DIFFERENTKEY_REPLACE", pvar, uimsg); SetDlgItemText(dlg, IDC_ADDTOKNOWNHOSTS, pvar->ts->UIMsg); GetDlgItemText(dlg, IDC_CONTINUE, uimsg, sizeof(uimsg)); UTIL_get_lang_msg("BTN_CONTINUE", pvar, uimsg); @@ -1507,12 +1507,12 @@ } } -void HOSTS_do_different_host_dialog(HWND wnd, PTInstVar pvar) +void HOSTS_do_different_key_dialog(HWND wnd, PTInstVar pvar) { if (pvar->hosts_state.hosts_dialog == NULL) { HWND cur_active = GetActiveWindow(); - DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SSHDIFFERENTHOST), + DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SSHDIFFERENTKEY), cur_active != NULL ? cur_active : wnd, hosts_replace_dlg_proc, (LPARAM) pvar); } @@ -1604,9 +1604,9 @@ if (found_different_key) { #if 0 PostMessage(pvar->NotificationWindow, WM_COMMAND, - ID_SSHDIFFERENTHOST, 0); + ID_SSHDIFFERENTKEY, 0); #else - HOSTS_do_different_host_dialog(pvar->NotificationWindow, pvar); + HOSTS_do_different_key_dialog(pvar->NotificationWindow, pvar); #endif } else { #if 0 Modified: trunk/ttssh2/ttxssh/resource.h =================================================================== --- trunk/ttssh2/ttxssh/resource.h 2011-02-22 09:44:56 UTC (rev 4329) +++ trunk/ttssh2/ttxssh/resource.h 2011-02-23 14:42:38 UTC (rev 4330) @@ -16,7 +16,7 @@ #define IDD_SSHPASSWD_INPUT 108 #define IDD_HOSTDLG 600 #define IDC_HOSTTCPIP 601 -#define IDD_SSHDIFFERENTHOST 601 +#define IDD_SSHDIFFERENTKEY 601 #define IDC_HOSTSERIAL 602 #define IDD_SSHAUTHSETUP 602 #define IDD_SSHFWDSETUP 603 Modified: trunk/ttssh2/ttxssh/ttxssh.c =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.c 2011-02-22 09:44:56 UTC (rev 4329) +++ trunk/ttssh2/ttxssh/ttxssh.c 2011-02-23 14:42:38 UTC (rev 4330) @@ -4171,8 +4171,8 @@ case ID_SSHUNKNOWNHOST: HOSTS_do_unknown_host_dialog(hWin, pvar); return 1; - case ID_SSHDIFFERENTHOST: - HOSTS_do_different_host_dialog(hWin, pvar); + case ID_SSHDIFFERENTKEY: + HOSTS_do_different_key_dialog(hWin, pvar); return 1; case ID_SSHASYNCMESSAGEBOX: if (pvar->err_msg != NULL) { Modified: trunk/ttssh2/ttxssh/ttxssh.h =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.h 2011-02-22 09:44:56 UTC (rev 4329) +++ trunk/ttssh2/ttxssh/ttxssh.h 2011-02-23 14:42:38 UTC (rev 4330) @@ -89,7 +89,7 @@ #define ID_SSHAUTH 62501 #define ID_SSHUNKNOWNHOST 62502 -#define ID_SSHDIFFERENTHOST 62503 +#define ID_SSHDIFFERENTKEY 62503 #define ID_SSHASYNCMESSAGEBOX 62504 #define OPTION_NONE 0 Modified: trunk/ttssh2/ttxssh/ttxssh.rc =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.rc 2011-02-22 09:44:56 UTC (rev 4329) +++ trunk/ttssh2/ttxssh/ttxssh.rc 2011-02-23 14:42:38 UTC (rev 4330) @@ -182,7 +182,7 @@ PUSHBUTTON "&Disconnect",IDCANCEL,115,222,50,14,WS_GROUP END -IDD_SSHDIFFERENTHOST DIALOGEX 0, 0, 215, 242 +IDD_SSHDIFFERENTKEY DIALOGEX 0, 0, 215, 242 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "SECURITY WARNING" FONT 8, "Tahoma", 0, 0, 0x0 @@ -409,7 +409,7 @@ BOTTOMMARGIN, 236 END - IDD_SSHDIFFERENTHOST, DIALOG + IDD_SSHDIFFERENTKEY, DIALOG BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 208