svnno****@sourc*****
svnno****@sourc*****
2015年 8月 17日 (月) 13:57:57 JST
Revision: 5945 http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5945 Author: yutakapon Date: 2015-08-17 13:57:57 +0900 (Mon, 17 Aug 2015) Log Message: ----------- チケット #35205 設定フォルダ:改善項目 ダイアログの項目名を変更し、I18Nに対応した。 Ticket Links: ------------ http://sourceforge.jp/projects/ttssh2/tracker/detail/35205 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/teraterm/common/tt_res.h trunk/teraterm/teraterm/ttermpro.rc trunk/teraterm/teraterm/vtwin.cpp -------------- next part -------------- Modified: trunk/installer/release/lang/English.lng =================================================================== --- trunk/installer/release/lang/English.lng 2015-08-17 04:08:25 UTC (rev 5944) +++ trunk/installer/release/lang/English.lng 2015-08-17 04:57:57 UTC (rev 5945) @@ -264,6 +264,11 @@ DLG_FILETRANS_PAUSE=Pau&se DLG_FILETRANS_CLOSE=Close +DLG_SETUPDIR_INIFILE=Tera Term Configuration File +DLG_SETUPDIR_KEYBOARDFILE=Keyboard Configuration File +DLG_SETUPDIR_CYGTERMFILE=CygTerm Configuration File +DLG_SETUPDIR_KNOWNHOSTSFILE=Known_hosts File + ; commonlib.c MSG_WINSOCK_ERROR=Cannot use winsock MSG_INVALID_HOST_ERROR=Invalid host Modified: trunk/installer/release/lang/French.lng =================================================================== --- trunk/installer/release/lang/French.lng 2015-08-17 04:08:25 UTC (rev 5944) +++ trunk/installer/release/lang/French.lng 2015-08-17 04:57:57 UTC (rev 5945) @@ -265,6 +265,11 @@ DLG_FILETRANS_PAUSE=Pau&se DLG_FILETRANS_CLOSE=Fermer +DLG_SETUPDIR_INIFILE=Tera Term Configuration File +DLG_SETUPDIR_KEYBOARDFILE=Keyboard Configuration File +DLG_SETUPDIR_CYGTERMFILE=CygTerm Configuration File +DLG_SETUPDIR_KNOWNHOSTSFILE=Known_hosts File + ; commonlib.c MSG_WINSOCK_ERROR=Impossible d'utiliser winsock MSG_INVALID_HOST_ERROR=H\xF4te invalide Modified: trunk/installer/release/lang/German.lng =================================================================== --- trunk/installer/release/lang/German.lng 2015-08-17 04:08:25 UTC (rev 5944) +++ trunk/installer/release/lang/German.lng 2015-08-17 04:57:57 UTC (rev 5945) @@ -265,6 +265,11 @@ DLG_FILETRANS_PAUSE=Pau&se DLG_FILETRANS_CLOSE=Schlie\xDFen +DLG_SETUPDIR_INIFILE=Tera Term Configuration File +DLG_SETUPDIR_KEYBOARDFILE=Keyboard Configuration File +DLG_SETUPDIR_CYGTERMFILE=CygTerm Configuration File +DLG_SETUPDIR_KNOWNHOSTSFILE=Known_hosts File + ; commonlib.c MSG_WINSOCK_ERROR=Kann Winsock nicht verwenden MSG_INVALID_HOST_ERROR=Falscher Hostname Modified: trunk/installer/release/lang/Japanese.lng =================================================================== --- trunk/installer/release/lang/Japanese.lng 2015-08-17 04:08:25 UTC (rev 5944) +++ trunk/installer/release/lang/Japanese.lng 2015-08-17 04:57:57 UTC (rev 5945) @@ -264,6 +264,11 @@ DLG_FILETRANS_PAUSE=\x88ꎞ\x92\xE2\x8E~(&S) DLG_FILETRANS_CLOSE=\x95\xB6\x82\xE9 +DLG_SETUPDIR_INIFILE=Tera Term\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B +DLG_SETUPDIR_KEYBOARDFILE=\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B +DLG_SETUPDIR_CYGTERMFILE=CygTerm\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B +DLG_SETUPDIR_KNOWNHOSTSFILE=Known_hosts\x83t\x83@\x83C\x83\x8B + ; commonlib.c MSG_WINSOCK_ERROR=Winsock \x82\xAA\x8Eg\x82\xA6\x82܂\xB9\x82\xF1 MSG_INVALID_HOST_ERROR=\x96\xB3\x8C\xF8\x82ȃz\x83X\x83g Modified: trunk/installer/release/lang/Korean.lng =================================================================== --- trunk/installer/release/lang/Korean.lng 2015-08-17 04:08:25 UTC (rev 5944) +++ trunk/installer/release/lang/Korean.lng 2015-08-17 04:57:57 UTC (rev 5945) @@ -265,6 +265,11 @@ DLG_FILETRANS_PAUSE=\xC0Ͻ\xC3\xC1\xDF\xC1\xF6(&S) DLG_FILETRANS_CLOSE=\xB4ݱ\xE2 +DLG_SETUPDIR_INIFILE=Tera Term Configuration File +DLG_SETUPDIR_KEYBOARDFILE=Keyboard Configuration File +DLG_SETUPDIR_CYGTERMFILE=CygTerm Configuration File +DLG_SETUPDIR_KNOWNHOSTSFILE=Known_hosts File + ; commonlib.c MSG_WINSOCK_ERROR=\xC0\xA9\xBC\xD3\xC0\xBB \xBB\xE7\xBF\xEB\xC7\xD2 \xBC\xF6 \xBE\xF8\xBD\xC0\xB4ϴ\xD9 MSG_INVALID_HOST_ERROR=\xC0߸\xF8\xB5\xC8 ȣ\xBD\xBAƮ Modified: trunk/installer/release/lang/Russian.lng =================================================================== --- trunk/installer/release/lang/Russian.lng 2015-08-17 04:08:25 UTC (rev 5944) +++ trunk/installer/release/lang/Russian.lng 2015-08-17 04:57:57 UTC (rev 5945) @@ -265,6 +265,11 @@ DLG_FILETRANS_PAUSE=&\xCF\xE0\xF3\xE7\xE0 DLG_FILETRANS_CLOSE=\xC7\xE0\xEA\xF0\xFB\xF2\xFC +DLG_SETUPDIR_INIFILE=Tera Term Configuration File +DLG_SETUPDIR_KEYBOARDFILE=Keyboard Configuration File +DLG_SETUPDIR_CYGTERMFILE=CygTerm Configuration File +DLG_SETUPDIR_KNOWNHOSTSFILE=Known_hosts File + ; commonlib.c MSG_WINSOCK_ERROR=\xCD\xE5 \xF3\xE4\xE0\xE5\xF2\xF1\xFF \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC winsock MSG_INVALID_HOST_ERROR=\xCD\xE5\xE2\xE5\xF0\xED\xFB\xE9 \xF5\xEE\xF1\xF2 Modified: trunk/installer/release/lang/Simplified Chinese.lng =================================================================== --- trunk/installer/release/lang/Simplified Chinese.lng 2015-08-17 04:08:25 UTC (rev 5944) +++ trunk/installer/release/lang/Simplified Chinese.lng 2015-08-17 04:57:57 UTC (rev 5945) @@ -265,6 +265,11 @@ DLG_FILETRANS_PAUSE=\xD4\xDDͣ(&S) DLG_FILETRANS_CLOSE=\xB9ر\xD5 +DLG_SETUPDIR_INIFILE=Tera Term Configuration File +DLG_SETUPDIR_KEYBOARDFILE=Keyboard Configuration File +DLG_SETUPDIR_CYGTERMFILE=CygTerm Configuration File +DLG_SETUPDIR_KNOWNHOSTSFILE=Known_hosts File + ; commonlib.c MSG_WINSOCK_ERROR=\xCE\xA8ʹ\xD3\xC3 Winsock MSG_INVALID_HOST_ERROR=\xCE\xDEЧ\xB5\xC4\xD6\xF7\xBB\xFA\xB5\xD8ַ Modified: trunk/installer/release/lang/Traditional Chinese.lng =================================================================== --- trunk/installer/release/lang/Traditional Chinese.lng 2015-08-17 04:08:25 UTC (rev 5944) +++ trunk/installer/release/lang/Traditional Chinese.lng 2015-08-17 04:57:57 UTC (rev 5945) @@ -265,6 +265,11 @@ DLG_FILETRANS_PAUSE=\xBCȰ\xB1(&S) DLG_FILETRANS_CLOSE=\xC3\xF6\xB3\xAC +DLG_SETUPDIR_INIFILE=Tera Term Configuration File +DLG_SETUPDIR_KEYBOARDFILE=Keyboard Configuration File +DLG_SETUPDIR_CYGTERMFILE=CygTerm Configuration File +DLG_SETUPDIR_KNOWNHOSTSFILE=Known_hosts File + ; commonlib.c MSG_WINSOCK_ERROR=\xB5L\xAAk\xA8ϥ\xCE Winsock MSG_INVALID_HOST_ERROR=\xB5L\xAEĪ\xBA\xA5D\xBE\xF7\xA6a\xA7} Modified: trunk/teraterm/common/tt_res.h =================================================================== --- trunk/teraterm/common/tt_res.h 2015-08-17 04:08:25 UTC (rev 5944) +++ trunk/teraterm/common/tt_res.h 2015-08-17 04:57:57 UTC (rev 5945) @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ \x82Ő\xB6\x90\xAC\x82\xB3\x82ꂽ\x83C\x83\x93\x83N\x83\x8B\x81[\x83h \x83t\x83@\x83C\x83\x8B\x81B -// C:\usr\ttssh2\trunk\teraterm\teraterm\ttermpro.rc \x82Ŏg\x97p +// C:\usr\ttssh2_vc2015\trunk\teraterm\teraterm\ttermpro.rc \x82Ŏg\x97p // #define IDI_TTERM 100 #define IDR_ACC 100 Modified: trunk/teraterm/teraterm/ttermpro.rc =================================================================== --- trunk/teraterm/teraterm/ttermpro.rc 2015-08-17 04:08:25 UTC (rev 5944) +++ trunk/teraterm/teraterm/ttermpro.rc 2015-08-17 04:57:57 UTC (rev 5945) @@ -13,36 +13,34 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// \x93\xFA\x96{\x8C\xEA resources +// \x93\xFA\x96{\x8C\xEA (\x93\xFA\x96{) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) -#ifdef _WIN32 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT #pragma code_page(932) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // // Dialog // -IDD_SETUP_DIR_DIALOG DIALOGEX 0, 0, 385, 115 +IDD_SETUP_DIR_DIALOG DIALOGEX 0, 0, 419, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Setup directory" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "INI",IDC_INI_SETUPDIR_STATIC,7,18,11,8 + LTEXT "Tera Term Configuration File",IDC_INI_SETUPDIR_STATIC,7,15,57,17 EDITTEXT IDC_INI_SETUPDIR_EDIT,73,16,253,14,ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "...",IDC_INI_SETUPDIR_BUTTON,338,16,26,14 - LTEXT "CNF",IDC_KEYCNF_SETUPDIR_STATIC,7,38,14,8 - EDITTEXT IDC_KEYCNF_SETUPDIR_EDIT,73,37,253,14,ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "...",IDC_KEYCNF_SETUPDIR_BUTTON,338,37,26,14 - LTEXT "cygterm.cfg",IDC_CYGTERM_SETUPDIR_STATIC,7,59,40,8 - EDITTEXT IDC_CYGTERM_SETUPDIR_EDIT,73,58,253,14,ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "...",IDC_CYGTERM_SETUPDIR_BUTTON,338,58,26,14 - LTEXT "ssh_known_hosts",IDC_SSH_SETUPDIR_STATIC,9,82,58,8 - EDITTEXT IDC_SSH_SETUPDIR_EDIT,73,81,253,14,ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "...",IDC_SSH_SETUPDIR_BUTTON,338,81,26,14 + LTEXT "Keyboard Configuration File",IDC_KEYCNF_SETUPDIR_STATIC,7,42,61,17 + EDITTEXT IDC_KEYCNF_SETUPDIR_EDIT,73,41,253,14,ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "...",IDC_KEYCNF_SETUPDIR_BUTTON,338,41,26,14 + LTEXT "CygTerm Configuration File",IDC_CYGTERM_SETUPDIR_STATIC,7,68,60,17 + EDITTEXT IDC_CYGTERM_SETUPDIR_EDIT,73,67,253,14,ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "...",IDC_CYGTERM_SETUPDIR_BUTTON,338,67,26,14 + LTEXT "Known_hosts File",IDC_SSH_SETUPDIR_STATIC,9,94,54,15 + EDITTEXT IDC_SSH_SETUPDIR_EDIT,73,93,253,14,ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "...",IDC_SSH_SETUPDIR_BUTTON,338,93,26,14 END @@ -52,19 +50,19 @@ // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_SETUP_DIR_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 378 + RIGHTMARGIN, 412 TOPMARGIN, 7 - BOTTOMMARGIN, 108 + BOTTOMMARGIN, 118 END END #endif // APSTUDIO_INVOKED -#endif // \x93\xFA\x96{\x8C\xEA resources +#endif // \x93\xFA\x96{\x8C\xEA (\x93\xFA\x96{) resources ///////////////////////////////////////////////////////////////////////////// @@ -72,10 +70,8 @@ // \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 ///////////////////////////////////////////////////////////////////////////// // @@ -339,7 +335,7 @@ // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_DAD_DIALOG, DIALOG BEGIN @@ -511,7 +507,7 @@ // Menu // -IDR_MENU MENU +IDR_MENU MENU BEGIN POPUP "&File" BEGIN @@ -625,7 +621,7 @@ END END -IDR_TEKMENU MENU +IDR_TEKMENU MENU BEGIN POPUP "&File" BEGIN @@ -656,7 +652,7 @@ END END -IDR_PASTEMENU MENU +IDR_PASTEMENU MENU BEGIN MENUITEM "&Paste", ID_EDIT_PASTE2 MENUITEM "Paste<C&R>", ID_EDIT_PASTECR @@ -668,7 +664,7 @@ // Accelerator // -IDR_ACC ACCELERATORS +IDR_ACC ACCELERATORS BEGIN "T", ID_ACC_AREYOUTHERE, VIRTKEY, ALT, NOINVERT "C", ID_ACC_COPY, VIRTKEY, ALT, NOINVERT Modified: trunk/teraterm/teraterm/vtwin.cpp =================================================================== --- trunk/teraterm/teraterm/vtwin.cpp 2015-08-17 04:08:25 UTC (rev 5944) +++ trunk/teraterm/teraterm/vtwin.cpp 2015-08-17 04:57:57 UTC (rev 5945) @@ -4755,6 +4755,23 @@ switch (msg) { case WM_INITDIALOG: + // I18N + get_lang_msg("DLG_SETUPDIR_INIFILE", ts.UIMsg, sizeof(ts.UIMsg), + "Tera Term Configuration File", ts.UILanguageFile); + SetDlgItemText(hDlgWnd, IDC_INI_SETUPDIR_STATIC, ts.UIMsg); + + get_lang_msg("DLG_SETUPDIR_KEYBOARDFILE", ts.UIMsg, sizeof(ts.UIMsg), + "Keyboard Configuration File", ts.UILanguageFile); + SetDlgItemText(hDlgWnd, IDC_KEYCNF_SETUPDIR_STATIC, ts.UIMsg); + + get_lang_msg("DLG_SETUPDIR_CYGTERMFILE", ts.UIMsg, sizeof(ts.UIMsg), + "CygTerm Configuration File", ts.UILanguageFile); + SetDlgItemText(hDlgWnd, IDC_CYGTERM_SETUPDIR_STATIC, ts.UIMsg); + + get_lang_msg("DLG_SETUPDIR_KNOWNHOSTSFILE", ts.UIMsg, sizeof(ts.UIMsg), + "Known_hosts File", ts.UILanguageFile); + SetDlgItemText(hDlgWnd, IDC_SSH_SETUPDIR_STATIC, ts.UIMsg); + if (GetModuleFileName(NULL, temp, sizeof(temp)) != 0) { ExtractDirName(temp, teratermexepath); }