svnno****@sourc*****
svnno****@sourc*****
2011年 4月 27日 (水) 16:52:07 JST
Revision: 4461 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4461 Author: doda Date: 2011-04-27 16:52:07 +0900 (Wed, 27 Apr 2011) Log Message: ----------- ãã¡ã¤ã«è»¢éãã¤ã¢ãã°ã®çµéæéã® I18N 対å¿ã 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/teraterm/common/tt_res.h trunk/teraterm/teraterm/filesys.cpp trunk/teraterm/teraterm/ftdlg.cpp trunk/teraterm/teraterm/protodlg.cpp trunk/teraterm/teraterm/ttermpro.rc -------------- next part -------------- Modified: trunk/installer/release/lang/English.lng =================================================================== --- trunk/installer/release/lang/English.lng 2011-04-27 07:14:16 UTC (rev 4460) +++ trunk/installer/release/lang/English.lng 2011-04-27 07:52:07 UTC (rev 4461) @@ -223,10 +223,12 @@ DLG_PROT_PROTO=Protocol: DLG_PROT_PACKET=Packet#: DLG_PROT_TRANS=Bytes transfered: +DLG_PROT_ELAPSED=Elapsed time: DLG_FILETRANS_FILENAME=Filename: DLG_FILETRANS_FULLPATH=Fullpath: DLG_FILETRANS_TRNAS=Bytes transfered: +DLG_FILETRANS_ELAPSED=Elapsed time: DLG_FILETRANS_START=&Start DLG_FILETRANS_PAUSE=Pau&se DLG_FILETRANS_CLOSE=Close Modified: trunk/installer/release/lang/French.lng =================================================================== --- trunk/installer/release/lang/French.lng 2011-04-27 07:14:16 UTC (rev 4460) +++ trunk/installer/release/lang/French.lng 2011-04-27 07:52:07 UTC (rev 4461) @@ -223,10 +223,12 @@ DLG_PROT_PROTO=Protocole: DLG_PROT_PACKET=N° Paquet: DLG_PROT_TRANS=Octets transférés: +DLG_PROT_ELAPSED=Elapsed time: DLG_FILETRANS_FILENAME=Nom de fichier: DLG_FILETRANS_FULLPATH=Chemin complet: DLG_FILETRANS_TRNAS=Octets transférés: +DLG_FILETRANS_ELAPSED=Elapsed time: DLG_FILETRANS_START=Démarrage DLG_FILETRANS_PAUSE=Pau&se DLG_FILETRANS_CLOSE=Fermer Modified: trunk/installer/release/lang/German.lng =================================================================== --- trunk/installer/release/lang/German.lng 2011-04-27 07:14:16 UTC (rev 4460) +++ trunk/installer/release/lang/German.lng 2011-04-27 07:52:07 UTC (rev 4461) @@ -223,10 +223,12 @@ DLG_PROT_PROTO=Protocoll: DLG_PROT_PACKET=Paket#: DLG_PROT_TRANS=Bytes übertragen: +DLG_PROT_ELAPSED=Elapsed time: DLG_FILETRANS_FILENAME=Dateiname: DLG_FILETRANS_FULLPATH=Vollständiger Pfad: DLG_FILETRANS_TRNAS=Bytes übertragen: +DLG_FILETRANS_ELAPSED=Elapsed time: DLG_FILETRANS_START=&Start DLG_FILETRANS_PAUSE=Pau&se DLG_FILETRANS_CLOSE=Schließen Modified: trunk/installer/release/lang/Japanese.lng =================================================================== --- trunk/installer/release/lang/Japanese.lng 2011-04-27 07:14:16 UTC (rev 4460) +++ trunk/installer/release/lang/Japanese.lng 2011-04-27 07:52:07 UTC (rev 4461) @@ -223,10 +223,12 @@ DLG_PROT_PROTO=vgR: DLG_PROT_PACKET=pPbg#: DLG_PROT_TRANS=]ÏeÊ: +DLG_PROT_ELAPSED=oßÔ: DLG_FILETRANS_FILENAME=t@C¼: DLG_FILETRANS_FULLPATH=tpX: DLG_FILETRANS_TRNAS=]ÏeÊ: +DLG_FILETRANS_ELAPSED=oßÔ: DLG_FILETRANS_START=ÄJ(&S) DLG_FILETRANS_PAUSE=êâ~(&S) DLG_FILETRANS_CLOSE=¶é Modified: trunk/teraterm/common/tt_res.h =================================================================== --- trunk/teraterm/common/tt_res.h 2011-04-27 07:14:16 UTC (rev 4460) +++ trunk/teraterm/common/tt_res.h 2011-04-27 07:52:07 UTC (rev 4461) @@ -146,8 +146,8 @@ #define IDC_CURSOR_CHANGE_IME 2524 #define IDC_PROT_ELAPSED 2525 #define IDC_PROTOELAPSEDTIME 2526 -#define IDC_ELAPSEDTEXT 2527 -#define IDC_ELAPSEDTIME 2528 +#define IDC_TRANS_ELAPSED 2527 +#define IDC_TRANS_ETIME 2528 #define ID_ACC_SENDBREAK 50001 #define ID_ACC_COPY 50002 #define ID_ACC_NEWCONNECTION 50003 Modified: trunk/teraterm/teraterm/filesys.cpp =================================================================== --- trunk/teraterm/teraterm/filesys.cpp 2011-04-27 07:14:16 UTC (rev 4460) +++ trunk/teraterm/teraterm/filesys.cpp 2011-04-27 07:52:07 UTC (rev 4461) @@ -223,6 +223,9 @@ GetDlgItemText(HFTDlg, IDC_TRANS_TRANS, uimsg, sizeof(uimsg)); get_lang_msg("DLG_FILETRANS_TRNAS", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); SetDlgItemText(HFTDlg, IDC_TRANS_TRANS, ts.UIMsg); + GetDlgItemText(HFTDlg, IDC_TRANS_ELAPSED, uimsg, sizeof(uimsg)); + get_lang_msg("DLG_FILETRANS_ELAPSED", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); + SetDlgItemText(HFTDlg, IDC_TRANS_ELAPSED, ts.UIMsg); GetDlgItemText(HFTDlg, IDCANCEL, uimsg, sizeof(uimsg)); get_lang_msg("DLG_FILETRANS_CLOSE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); SetDlgItemText(HFTDlg, IDCANCEL, ts.UIMsg); @@ -236,7 +239,7 @@ if (fv->OpId == OpSendFile) { fv->StartTime = GetTickCount(); InitDlgProgress(HFTDlg, IDC_TRANSPROGRESS, &fv->ProgStat); - ShowWindow(GetDlgItem(HFTDlg, IDC_ELAPSEDTEXT), SW_SHOW); + ShowWindow(GetDlgItem(HFTDlg, IDC_TRANS_ELAPSED), SW_SHOW); } return (FTDlg!=NULL); @@ -1112,6 +1115,9 @@ GetDlgItemText(Hpd, IDC_PROT_TRANS, uimsg, sizeof(uimsg)); get_lang_msg("DLG_PROT_TRANS", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); SetDlgItemText(Hpd, IDC_PROT_TRANS, ts.UIMsg); + GetDlgItemText(Hpd, IDC_PROT_ELAPSED, uimsg, sizeof(uimsg)); + get_lang_msg("DLG_PROT_ELAPSED", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); + SetDlgItemText(Hpd, IDC_PROT_ELAPSED, ts.UIMsg); GetDlgItemText(Hpd, IDCANCEL, uimsg, sizeof(uimsg)); get_lang_msg("BTN_CANCEL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); SetDlgItemText(Hpd, IDCANCEL, ts.UIMsg); Modified: trunk/teraterm/teraterm/ftdlg.cpp =================================================================== --- trunk/teraterm/teraterm/ftdlg.cpp 2011-04-27 07:14:16 UTC (rev 4460) +++ trunk/teraterm/teraterm/ftdlg.cpp 2011-04-27 07:52:07 UTC (rev 4461) @@ -81,6 +81,8 @@ SendDlgItemMessage(IDC_EDIT_FULLPATH, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(IDC_TRANS_TRANS, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(IDC_TRANSBYTES, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(IDC_TRANS_ELAPSED, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(IDC_TRANS_ETIME, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(IDC_TRANSPAUSESTART, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(IDCANCEL, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(IDC_TRANSHELP, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); @@ -114,7 +116,7 @@ if (fv->OpId == OpSendFile) { if (fv->StartTime == 0) { - SetDlgItemText(IDC_ELAPSEDTIME, "0:00"); + SetDlgItemText(IDC_TRANS_ETIME, "0:00"); prev_elapsed = 0; } else { @@ -130,7 +132,7 @@ else { _snprintf_s(NumStr, sizeof(NumStr), _TRUNCATE, "%d:%02d (%d.%02dMB/s)", elapsed / 60, elapsed % 60, rate2 / (1000*1000), rate2 / 10000 % 100); } - SetDlgItemText(IDC_ELAPSEDTIME, NumStr); + SetDlgItemText(IDC_TRANS_ETIME, NumStr); prev_elapsed = elapsed; } } Modified: trunk/teraterm/teraterm/protodlg.cpp =================================================================== --- trunk/teraterm/teraterm/protodlg.cpp 2011-04-27 07:14:16 UTC (rev 4460) +++ trunk/teraterm/teraterm/protodlg.cpp 2011-04-27 07:52:07 UTC (rev 4461) @@ -47,6 +47,8 @@ SendDlgItemMessage(IDC_PROTOPKTNUM, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(IDC_PROT_TRANS, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(IDC_PROTOBYTECOUNT, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(IDC_PROT_ELAPSED, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(IDC_PROTOELAPSEDTIME, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(IDC_PROTOPERCENT, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(IDCANCEL, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0)); } Modified: trunk/teraterm/teraterm/ttermpro.rc =================================================================== --- trunk/teraterm/teraterm/ttermpro.rc 2011-04-27 07:14:16 UTC (rev 4460) +++ trunk/teraterm/teraterm/ttermpro.rc 2011-04-27 07:52:07 UTC (rev 4461) @@ -230,8 +230,8 @@ EDITTEXT IDC_EDIT_FULLPATH,55,24,106,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_CLIENTEDGE CONTROL "Bytes transfered:",IDC_TRANS_TRANS,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,15,38,76,10 RTEXT "",IDC_TRANSBYTES,97,38,64,10 - CONTROL "Elapsed time:",IDC_ELAPSEDTEXT,"Static",SS_LEFTNOWORDWRAP | NOT WS_VISIBLE, 15,48,46,8 - RTEXT "",IDC_ELAPSEDTIME,60,48,101,8 + CONTROL "Elapsed time:",IDC_TRANS_ELAPSED,"Static",SS_LEFTNOWORDWRAP | NOT WS_VISIBLE, 15,48,46,8 + RTEXT "",IDC_TRANS_ETIME,60,48,101,8 CONTROL "",IDC_TRANSPROGRESS,"msctls_progress32",NOT WS_VISIBLE | WS_BORDER,15,60,146,12 DEFPUSHBUTTON "Close",IDCANCEL,18,76,40,14 PUSHBUTTON "Pau&se",IDC_TRANSPAUSESTART,68,76,40,14