svnno****@sourc*****
svnno****@sourc*****
2017年 5月 12日 (金) 21:43:05 JST
Revision: 6721 http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6721 Author: doda Date: 2017-05-12 21:43:04 +0900 (Fri, 12 May 2017) Log Message: ----------- エラーメッセージの i18n 対応 (ssh-subsystem) 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/ssh.c -------------- next part -------------- Modified: trunk/installer/release/lang/English.lng =================================================================== --- trunk/installer/release/lang/English.lng 2017-05-12 12:42:45 UTC (rev 6720) +++ trunk/installer/release/lang/English.lng 2017-05-12 12:43:04 UTC (rev 6721) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2017-04-24) +; Updated by TeraTerm Project (2017-05-12) [Tera Term] DLG_SYSTEM_FONT=System,14,0 @@ -856,6 +856,7 @@ MSG_SSH_GEX_SIZE_OUTOFRANGE=Received group size is out of range: %d MSG_SSH_GEX_SIZE_SMALLER=Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group? MSG_SSH_GEX_SIZE_LARGER=Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group? +MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s) ; ttxssh.c MSG_UNKNOWN_OPTION_ERROR=Unrecognized command-line option: %s Modified: trunk/installer/release/lang/French.lng =================================================================== --- trunk/installer/release/lang/French.lng 2017-05-12 12:42:45 UTC (rev 6720) +++ trunk/installer/release/lang/French.lng 2017-05-12 12:43:04 UTC (rev 6721) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2017-04-24) +; Updated by TeraTerm Project (2017-05-12) ; Last translated (French language) by Francois MOCQ (2010-07-21) [Tera Term] @@ -857,6 +857,7 @@ MSG_SSH_GEX_SIZE_OUTOFRANGE=Received group size is out of range: %d MSG_SSH_GEX_SIZE_SMALLER=Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group? MSG_SSH_GEX_SIZE_LARGER=Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group? +MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s) ; ttxssh.c MSG_UNKNOWN_OPTION_ERROR=Option inconnue sur la ligne de commande: %s Modified: trunk/installer/release/lang/German.lng =================================================================== --- trunk/installer/release/lang/German.lng 2017-05-12 12:42:45 UTC (rev 6720) +++ trunk/installer/release/lang/German.lng 2017-05-12 12:43:04 UTC (rev 6721) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2017-04-24) +; Updated by TeraTerm Project (2017-05-12) ; Last translated (German language) by Frederik Schwarzer (2010-05-17) [Tera Term] @@ -857,6 +857,7 @@ MSG_SSH_GEX_SIZE_OUTOFRANGE=Received group size is out of range: %d MSG_SSH_GEX_SIZE_SMALLER=Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group? MSG_SSH_GEX_SIZE_LARGER=Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group? +MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s) ; ttxssh.c MSG_UNKNOWN_OPTION_ERROR=Unbekannte Befehlszeilen-Option: %s Modified: trunk/installer/release/lang/Japanese.lng =================================================================== --- trunk/installer/release/lang/Japanese.lng 2017-05-12 12:42:45 UTC (rev 6720) +++ trunk/installer/release/lang/Japanese.lng 2017-05-12 12:43:04 UTC (rev 6721) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2017-04-24) +; Updated by TeraTerm Project (2017-05-12) [Tera Term] DLG_SYSTEM_FONT=\x82l\x82r \x82o\x83S\x83V\x83b\x83N,12,128 @@ -856,6 +856,7 @@ MSG_SSH_GEX_SIZE_OUTOFRANGE=\x8E\xF3\x90M\x82\xB5\x82\xBD\x83O\x83\x8B\x81[\x83v\x83T\x83C\x83Y\x82\xAA\x94͈͊O\x82ł\xB7: %d MSG_SSH_GEX_SIZE_SMALLER=\x8E\xF3\x90M\x82\xB5\x82\xBD\x83O\x83\x8B\x81[\x83v\x83T\x83C\x83Y\x82\xAA\x97v\x8B\x81\x82\xB5\x82\xBD\x8Dŏ\xAC\x83T\x83C\x83Y\x82\xE6\x82菬\x82\xB3\x82\xA2\x82ł\xB7. \n\x97v\x8B\x81\x82\xB5\x82\xBD\x83T\x83C\x83Y: %d, \x8E\xF3\x90M\x82\xB5\x82\xBD\x83T\x83C\x83Y: %d\n\x8E\xF3\x90M\x82\xB5\x82\xBD\x83O\x83\x8B\x81[\x83v\x82\xF0\x8E\xFC\x82\xEA\x82܂\xB7\x82\xA9\x81H MSG_SSH_GEX_SIZE_LARGER=\x8E\xF3\x90M\x82\xB5\x82\xBD\x83O\x83\x8B\x81[\x83v\x83T\x83C\x83Y\x82\xAA\x97v\x8B\x81\x82\xB5\x82\xBD\x8Dő\xE5\x83T\x83C\x83Y\x82\xE6\x82\xE8\x91傫\x82\xA2\x82ł\xB7. \n\x97v\x8B\x81\x82\xB5\x82\xBD\x83T\x83C\x83Y: %d, \x8E\xF3\x90M\x82\xB5\x82\xBD\x83T\x83C\x83Y: %d\n\x8E\xF3\x90M\x82\xB5\x82\xBD\x83O\x83\x8B\x81[\x83v\x82\xF0\x8E\xFC\x82\xEA\x82܂\xB7\x82\xA9\x81H +MSG_SSH_SUBSYSTEM_REQUEST_ERROR=\x83T\x83u\x83V\x83X\x83e\x83\x80\x82̗v\x8B\x81\x82\xAA\x8E\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD. (%s) ; ttxssh.c MSG_UNKNOWN_OPTION_ERROR=\x96\xB3\x8C\xF8\x82ȃR\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83I\x83v\x83V\x83\x87\x83\x93: %s Modified: trunk/installer/release/lang/Korean.lng =================================================================== --- trunk/installer/release/lang/Korean.lng 2017-05-12 12:42:45 UTC (rev 6720) +++ trunk/installer/release/lang/Korean.lng 2017-05-12 12:43:04 UTC (rev 6721) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2017-04-24) +; Updated by TeraTerm Project (2017-05-12) ; Last translated (Korean language) by Daehong Kim (2013-07-25) [Tera Term] @@ -857,6 +857,7 @@ MSG_SSH_GEX_SIZE_OUTOFRANGE=Received group size is out of range: %d MSG_SSH_GEX_SIZE_SMALLER=Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group? MSG_SSH_GEX_SIZE_LARGER=Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group? +MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s) ; ttxssh.c MSG_UNKNOWN_OPTION_ERROR=\xC0νĵ\xC7\xC1\xF6 \xBEʴ\xC2 \xB8\xED\xB7\xC9\xC7\xE0 \xBFɼ\xC7: %s Modified: trunk/installer/release/lang/Russian.lng =================================================================== --- trunk/installer/release/lang/Russian.lng 2017-05-12 12:42:45 UTC (rev 6720) +++ trunk/installer/release/lang/Russian.lng 2017-05-12 12:43:04 UTC (rev 6721) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2017-04-24) +; Updated by TeraTerm Project (2017-05-12) ; Last translated (Russian language) by Ryumik Sergey (2015-03-14) [Tera Term] @@ -857,6 +857,7 @@ MSG_SSH_GEX_SIZE_OUTOFRANGE=Received group size is out of range: %d MSG_SSH_GEX_SIZE_SMALLER=Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group? MSG_SSH_GEX_SIZE_LARGER=Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group? +MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s) ; ttxssh.c MSG_UNKNOWN_OPTION_ERROR=\xCD\xE5\xE2\xE5\xF0\xED\xFB\xE9 \xEF\xE0\xF0\xE0\xEC\xE5\xF2\xF0 \xE2 \xEA\xEE\xEC\xE0\xED\xE4\xED\xEE\xE9 \xF1\xF2\xF0\xEE\xEA\xE5: %s Modified: trunk/installer/release/lang/Simplified Chinese.lng =================================================================== --- trunk/installer/release/lang/Simplified Chinese.lng 2017-05-12 12:42:45 UTC (rev 6720) +++ trunk/installer/release/lang/Simplified Chinese.lng 2017-05-12 12:43:04 UTC (rev 6721) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2017-04-24) +; Updated by TeraTerm Project (2017-05-12) ; Last translated (Simplified Chinese language) by LiShaohui (2017-04-11) [Tera Term] @@ -857,6 +857,7 @@ MSG_SSH_GEX_SIZE_OUTOFRANGE=\xBD\xD3\xCAյ\xBD\xB5\xC4\xD7\xE9\xB4\xF3С\xB3\xAC\xB3\xF6\xB7\xB6Χ\xA3\xBA%d MSG_SSH_GEX_SIZE_SMALLER=\xBD\xD3\xCAյ\xBD\xB5\xC4\xD7\xE9\xB4\xF3СС\xD3\xDA\xC7\xEB\xC7\xF3\xB5\xC4\xD7\xEEСֵ\xA1\xA3\n\xC7\xEB\xC7\xF3\xA3\xBA%d\xA3\xAC\xCAյ\xBD\xA3\xBA%d\nȷ\xB6\xA8Ҫ\xBD\xD3\xCA\xDC\xCAյ\xBD\xB5\xC4\xD7\xE9\xC2\xF0\xA3\xBF MSG_SSH_GEX_SIZE_LARGER=\xBD\xD3\xCAյ\xBD\xB5\xC4\xD7\xE9\xB4\xF3С\xB4\xF3\xD3\xDA\xC7\xEB\xC7\xF3\xB5\xC4\xD7\xEE\xB4\xF3ֵ\xA1\xA3\n\xC7\xEB\xC7\xF3\xA3\xBA%d\xA3\xAC\xCAյ\xBD\xA3\xBA%d\nȷ\xB6\xA8Ҫ\xBD\xD3\xCA\xDC\xCAյ\xBD\xB5\xC4\xD7\xE9\xC2\xF0\xA3\xBF +MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s) ; ttxssh.c MSG_UNKNOWN_OPTION_ERROR=\xCE\xDEЧ\xB5\xC4\xC3\xFC\xC1\xEE\xD0\xD0ѡ\xCF%s Modified: trunk/installer/release/lang/Traditional Chinese.lng =================================================================== --- trunk/installer/release/lang/Traditional Chinese.lng 2017-05-12 12:42:45 UTC (rev 6720) +++ trunk/installer/release/lang/Traditional Chinese.lng 2017-05-12 12:43:04 UTC (rev 6721) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2017-04-24) +; Updated by TeraTerm Project (2017-05-12) ; Last translated (Traditional Chinese language) by kikiqqp (2014-09-20) [Tera Term] @@ -857,6 +857,7 @@ MSG_SSH_GEX_SIZE_OUTOFRANGE=Received group size is out of range: %d MSG_SSH_GEX_SIZE_SMALLER=Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group? MSG_SSH_GEX_SIZE_LARGER=Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group? +MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s) ; ttxssh.c MSG_UNKNOWN_OPTION_ERROR=\xB5L\xAEĪ\xBA\xA9R\xA5O\xA6\xE6\xBFﶵ\xA1G%s Modified: trunk/ttssh2/ttxssh/ssh.c =================================================================== --- trunk/ttssh2/ttxssh/ssh.c 2017-05-12 12:42:45 UTC (rev 6720) +++ trunk/ttssh2/ttxssh/ssh.c 2017-05-12 12:43:04 UTC (rev 6721) @@ -7844,7 +7844,10 @@ if (pvar->shell_id == channel_id) { if (c->type == TYPE_SUBSYSTEM_GEN) { // \x83T\x83u\x83V\x83X\x83e\x83\x80\x82̋N\x93\xAE\x82Ɏ\xB8\x94s\x82\xB5\x82\xBD\x82̂Ő\xE9\x81B - notify_fatal_error(pvar, "subsystem request failed.", 1); + char errmsg[MAX_UIMSG]; + UTIL_get_lang_msg("MSG_SSH_SUBSYSTEM_REQUEST_ERROR", pvar, "subsystem request failed. (%s)"); + _snprintf_s(errmsg, sizeof(errmsg), _TRUNCATE, pvar->ts->UIMsg, pvar->subsystem_name); + notify_fatal_error(pvar, errmsg, TRUE); return TRUE; } else { // TYPE_SHELL