svnno****@sourc*****
svnno****@sourc*****
2017年 4月 11日 (火) 02:52:31 JST
Revision: 6673 http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6673 Author: doda Date: 2017-04-11 02:52:31 +0900 (Tue, 11 Apr 2017) 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/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/teraterm/vtterm.c -------------- next part -------------- Modified: trunk/installer/release/lang/English.lng =================================================================== --- trunk/installer/release/lang/English.lng 2017-04-10 17:52:27 UTC (rev 6672) +++ trunk/installer/release/lang/English.lng 2017-04-10 17:52:31 UTC (rev 6673) @@ -132,6 +132,14 @@ DLG_MAIN_TITLE_CONNECTING=[connecting...] DLG_MAIN_TITLE_DISCONNECTED=[disconnected] +; vtterm.c +MSG_CBACCESS_TITLE=Clipboad Access +MSG_CBACCESS_REJECT_TITLE=Rejected Clipboard Access +MSG_CBACCESS_READ=Remote host reads clipboard contents. +MSG_CBACCESS_WRITE=Remote host writes clipboard. +MSG_CBACCESS_READ_REJECT=Reject clipboard read access from remote. +MSG_CBACCESS_WRITE_REJECT=Reject clipboard write access from remote. + ; vtwin.cpp MSG_ALL_TERMINATE_CONF=Terminate ALL Tera Term(s)? MSG_DISCONNECT_CONF=Disconnect? Modified: trunk/installer/release/lang/French.lng =================================================================== --- trunk/installer/release/lang/French.lng 2017-04-10 17:52:27 UTC (rev 6672) +++ trunk/installer/release/lang/French.lng 2017-04-10 17:52:31 UTC (rev 6673) @@ -133,6 +133,14 @@ DLG_MAIN_TITLE_CONNECTING=[connexion...] DLG_MAIN_TITLE_DISCONNECTED=[d\xE9connect\xE9] +; vtterm.c +MSG_CBACCESS_TITLE=Clipboad Access +MSG_CBACCESS_REJECT_TITLE=Rejected Clipboard Access +MSG_CBACCESS_READ=Remote host reads clipboard contents. +MSG_CBACCESS_WRITE=Remote host writes clipboard. +MSG_CBACCESS_READ_REJECT=Reject clipboard read access from remote. +MSG_CBACCESS_WRITE_REJECT=Reject clipboard write access from remote. + ; vtwin.cpp MSG_ALL_TERMINATE_CONF=Terminate ALL Tera Term(s)? MSG_DISCONNECT_CONF=D\xE9connecter? Modified: trunk/installer/release/lang/German.lng =================================================================== --- trunk/installer/release/lang/German.lng 2017-04-10 17:52:27 UTC (rev 6672) +++ trunk/installer/release/lang/German.lng 2017-04-10 17:52:31 UTC (rev 6673) @@ -133,6 +133,14 @@ DLG_MAIN_TITLE_CONNECTING=[verbinden...] DLG_MAIN_TITLE_DISCONNECTED=[getrennt] +; vtterm.c +MSG_CBACCESS_TITLE=Clipboad Access +MSG_CBACCESS_REJECT_TITLE=Rejected Clipboard Access +MSG_CBACCESS_READ=Remote host reads clipboard contents. +MSG_CBACCESS_WRITE=Remote host writes clipboard. +MSG_CBACCESS_READ_REJECT=Reject clipboard read access from remote. +MSG_CBACCESS_WRITE_REJECT=Reject clipboard write access from remote. + ; vtwin.cpp MSG_ALL_TERMINATE_CONF=Terminate ALL Tera Term(s)? MSG_DISCONNECT_CONF=Verbindung trennen? Modified: trunk/installer/release/lang/Japanese.lng =================================================================== --- trunk/installer/release/lang/Japanese.lng 2017-04-10 17:52:27 UTC (rev 6672) +++ trunk/installer/release/lang/Japanese.lng 2017-04-10 17:52:31 UTC (rev 6673) @@ -132,6 +132,14 @@ DLG_MAIN_TITLE_CONNECTING=[\x90ڑ\xB1\x92\x86...] DLG_MAIN_TITLE_DISCONNECTED=[\x96\xA2\x90ڑ\xB1] +; vtterm.c +MSG_CBACCESS_TITLE=\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x83A\x83N\x83Z\x83X +MSG_CBACCESS_REJECT_TITLE=\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x83A\x83N\x83Z\x83X\x82̋\x91\x94\xDB +MSG_CBACCESS_READ=\x83\x8A\x83\x82\x81[\x83g\x83z\x83X\x83g\x82\xAA\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82̓\xE0\x97e\x82\xF0\x93ǂݎ\xE6\x82\xE8\x82܂\xB5\x82\xBD\x81B +MSG_CBACCESS_WRITE=\x83\x8A\x83\x82\x81[\x83g\x83z\x83X\x83g\x82\xAA\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɏ\x91\x82\xAB\x8D\x9E\x82݂܂\xB5\x82\xBD\x81B +MSG_CBACCESS_READ_REJECT=\x83\x8A\x83\x82\x81[\x83g\x83z\x83X\x83g\x82\xA9\x82\xE7\x82̃N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x93ǂݎ\xE6\x82\xE8\x82\xF0\x8B\x91\x94ۂ\xB5\x82܂\xB5\x82\xBD\x81B +MSG_CBACCESS_WRITE_REJECT=\x83\x8A\x83\x82\x81[\x83g\x83z\x83X\x83g\x82\xA9\x82\xE7\x82̃N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x8F\x91\x82\xAB\x8D\x9E\x82݂\xF0\x8B\x91\x94ۂ\xB5\x82܂\xB5\x82\xBD\x81B + ; vtwin.cpp MSG_ALL_TERMINATE_CONF=\x91STera Term\x82\xF0\x8B\xAD\x90\xA7\x8FI\x97\xB9\x82\xB5\x82܂\xB7\x82\xA9\x81H MSG_DISCONNECT_CONF=\x90ؒf\x82\xB5\x82܂\xB7\x82\xA9\x81H Modified: trunk/installer/release/lang/Korean.lng =================================================================== --- trunk/installer/release/lang/Korean.lng 2017-04-10 17:52:27 UTC (rev 6672) +++ trunk/installer/release/lang/Korean.lng 2017-04-10 17:52:31 UTC (rev 6673) @@ -133,6 +133,14 @@ DLG_MAIN_TITLE_CONNECTING=[\xBF\xAC\xB0\xE1...] DLG_MAIN_TITLE_DISCONNECTED=[\xB2\xF7\xBE\xEE\xC1\xFC] +; vtterm.c +MSG_CBACCESS_TITLE=Clipboad Access +MSG_CBACCESS_REJECT_TITLE=Rejected Clipboard Access +MSG_CBACCESS_READ=Remote host reads clipboard contents. +MSG_CBACCESS_WRITE=Remote host writes clipboard. +MSG_CBACCESS_READ_REJECT=Reject clipboard read access from remote. +MSG_CBACCESS_WRITE_REJECT=Reject clipboard write access from remote. + ; vtwin.cpp MSG_ALL_TERMINATE_CONF=Terminate ALL Tera Term(s)? MSG_DISCONNECT_CONF=\xBF\xAC\xB0\xE1\xC0\xBB \xB2\xF7\xC0\xBB\xB1\xEE\xBF\xE4? Modified: trunk/installer/release/lang/Russian.lng =================================================================== --- trunk/installer/release/lang/Russian.lng 2017-04-10 17:52:27 UTC (rev 6672) +++ trunk/installer/release/lang/Russian.lng 2017-04-10 17:52:31 UTC (rev 6673) @@ -133,6 +133,14 @@ DLG_MAIN_TITLE_CONNECTING=[\xF1\xEE\xE5\xE4\xE8\xED\xFF\xE5\xF2\xF1\xFF...] DLG_MAIN_TITLE_DISCONNECTED=[\xF0\xE0\xE7\xFA\xE5\xE4\xE8\xED\xE5\xED\xEE] +; vtterm.c +MSG_CBACCESS_TITLE=Clipboad Access +MSG_CBACCESS_REJECT_TITLE=Rejected Clipboard Access +MSG_CBACCESS_READ=Remote host reads clipboard contents. +MSG_CBACCESS_WRITE=Remote host writes clipboard. +MSG_CBACCESS_READ_REJECT=Reject clipboard read access from remote. +MSG_CBACCESS_WRITE_REJECT=Reject clipboard write access from remote. + ; vtwin.cpp MSG_ALL_TERMINATE_CONF=\xCE\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xFC \xE2\xF1\xE5 Tera Term(\xFB)? MSG_DISCONNECT_CONF=\xD0\xE0\xE7\xFA\xE5\xE4\xE8\xED\xE8\xF2\xFC? Modified: trunk/installer/release/lang/Simplified Chinese.lng =================================================================== --- trunk/installer/release/lang/Simplified Chinese.lng 2017-04-10 17:52:27 UTC (rev 6672) +++ trunk/installer/release/lang/Simplified Chinese.lng 2017-04-10 17:52:31 UTC (rev 6673) @@ -133,6 +133,14 @@ DLG_MAIN_TITLE_CONNECTING=[\xD5\xFD\xD4\xDA\xC1\xAC\xBD\xD3...] DLG_MAIN_TITLE_DISCONNECTED=[δ\xC1\xAC\xBD\xD3] +; vtterm.c +MSG_CBACCESS_TITLE=Clipboad Access +MSG_CBACCESS_REJECT_TITLE=Rejected Clipboard Access +MSG_CBACCESS_READ=Remote host reads clipboard contents. +MSG_CBACCESS_WRITE=Remote host writes clipboard. +MSG_CBACCESS_READ_REJECT=Reject clipboard read access from remote. +MSG_CBACCESS_WRITE_REJECT=Reject clipboard write access from remote. + ; vtwin.cpp MSG_ALL_TERMINATE_CONF=\xCD˳\xF6ȫ\xB2\xBF Tera Term \xBBỰ\xA3\xBF MSG_DISCONNECT_CONF=\xB6Ͽ\xAA\xC1\xAC\xBDӣ\xBF Modified: trunk/installer/release/lang/Traditional Chinese.lng =================================================================== --- trunk/installer/release/lang/Traditional Chinese.lng 2017-04-10 17:52:27 UTC (rev 6672) +++ trunk/installer/release/lang/Traditional Chinese.lng 2017-04-10 17:52:31 UTC (rev 6673) @@ -133,6 +133,14 @@ DLG_MAIN_TITLE_CONNECTING=[\xA5\xBF\xA6b\xB3s\xBDu...] DLG_MAIN_TITLE_DISCONNECTED=[\xA5\xBC\xB3s\xBDu] +; vtterm.c +MSG_CBACCESS_TITLE=Clipboad Access +MSG_CBACCESS_REJECT_TITLE=Rejected Clipboard Access +MSG_CBACCESS_READ=Remote host reads clipboard contents. +MSG_CBACCESS_WRITE=Remote host writes clipboard. +MSG_CBACCESS_READ_REJECT=Reject clipboard read access from remote. +MSG_CBACCESS_WRITE_REJECT=Reject clipboard write access from remote. + ; vtwin.cpp MSG_ALL_TERMINATE_CONF=\xC3\x{1B3B25}\xFE\xB3\xA1 Tera Term \xB3s\xBDu\xA1H MSG_DISCONNECT_CONF=\xA4\xA4\xC2_\xB3s\xBDu\xA1H Modified: trunk/teraterm/teraterm/vtterm.c =================================================================== --- trunk/teraterm/teraterm/vtterm.c 2017-04-10 17:52:27 UTC (rev 6672) +++ trunk/teraterm/teraterm/vtterm.c 2017-04-10 17:52:31 UTC (rev 6673) @@ -4579,7 +4579,7 @@ void XsProcClipboard(PCHAR buff) { int len, blen; - char *p, *cbbuff, hdr[20], notify_buff[256]; + char *p, *cbbuff, hdr[20], notify_buff[256], notify_title[MAX_UIMSG]; HGLOBAL cbmem; int wide_len; HGLOBAL wide_cbmem; @@ -4594,7 +4594,11 @@ if (*p == '?' && *(p+1) == 0) { // Read access if (ts.CtrlFlag & CSF_CBREAD) { if (ts.NotifyClipboardAccess) { - NotifyInfoMessage(&cv, "Remote host reads clipboard contents", "Clipboard Access"); + get_lang_msg("MSG_CBACCESS_TITLE", notify_title, sizeof(notify_title), + "Clipboard Access", ts.UILanguageFile); + get_lang_msg("MSG_CBACCESS_READ", notify_buff, sizeof(notify_buff), + "Remote host reads clipboard contents.", ts.UILanguageFile); + NotifyInfoMessage(&cv, notify_buff, notify_title); } strncpy_s(hdr, sizeof(hdr), "\033]52;", _TRUNCATE); if (strncat_s(hdr, sizeof(hdr), buff, p - buff) == 0) { @@ -4602,7 +4606,11 @@ } } else if (ts.NotifyClipboardAccess) { - NotifyWarnMessage(&cv, "Reject clipboard read access from remote", "Rejected Clipboard Access"); + get_lang_msg("MSG_CBACCESS_REJECT_TITLE", notify_title, sizeof(notify_title), + "Rejected Clipboard Access", ts.UILanguageFile); + get_lang_msg("MSG_CBACCESS_READ_REJECT", notify_buff, sizeof(notify_buff), + "Reject clipboard read access from remote.", ts.UILanguageFile); + NotifyWarnMessage(&cv, notify_buff, notify_title); } } else if (ts.CtrlFlag & CSF_CBWRITE) { // Write access @@ -4629,8 +4637,12 @@ GlobalUnlock(cbmem); if (ts.NotifyClipboardAccess) { - _snprintf_s(notify_buff, sizeof(notify_buff), _TRUNCATE, "Remote host writes clipboard.\n--\n%s", cbbuff); - NotifyInfoMessage(&cv, notify_buff, "Clipboard Access"); + get_lang_msg("MSG_CBACCESS_TITLE", notify_title, sizeof(notify_title), + "Clipboard Access", ts.UILanguageFile); + get_lang_msg("MSG_CBACCESS_WRITE", ts.UIMsg, sizeof(ts.UIMsg), + "Remote host wirtes clipboard.", ts.UILanguageFile); + _snprintf_s(notify_buff, sizeof(notify_buff), _TRUNCATE, "%s\n--\n%s", ts.UIMsg, cbbuff); + NotifyInfoMessage(&cv, notify_buff, notify_title); } wide_len = MultiByteToWideChar(CP_ACP, 0, cbbuff, -1, NULL, 0); @@ -4651,7 +4663,11 @@ } } else if (ts.NotifyClipboardAccess) { - NotifyWarnMessage(&cv, "Reject clipboard write access from remote", "Rejected Clipboard Access"); + get_lang_msg("MSG_CBACCESS_REJECT_TITLE", notify_title, sizeof(notify_title), + "Rejected Clipboard Access", ts.UILanguageFile); + get_lang_msg("MSG_CBACCESS_WRITE_REJECT", notify_buff, sizeof(notify_buff), + "Reject clipboard write access from remote.", ts.UILanguageFile); + NotifyWarnMessage(&cv, notify_buff, notify_title); } } }