Tera TermRevision: 8189
https://osdn.net/projects/ttssh2/scm/svn/commits/8189
Author: yutakapon
Date: 2019-09-18 23:43:02 +0900 (Wed, 18 Sep 2019)
Log Message:
-----------
シリアルポート設定ダイアログのOKボタン名を一部変更した。
branches/serial_port_improvedからリビジョン8183, 8185をマージ:
シリアルポート設定ダイアログのOKボタン名を一部変更した。
........
r8183 をフィードバックした。
........
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/8183
Modified Paths:
--------------
trunk/doc/en/html/menu/setup-serialport.html
trunk/doc/ja/html/menu/setup-serialport.html
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/ttpdlg/ttdlg.c
Property Changed:
----------------
trunk/
trunk/teraterm/
-------------- next part --------------
Index: trunk
===================================================================
--- trunk 2019-09-18 14:39:50 UTC (rev 8188)
+++ trunk 2019-09-18 14:43:02 UTC (rev 8189)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/flowctrl_dsrdtr:7825-7827
/branches/openssl_1_1_1_v2:7888
/branches/portfwd_memleak:7732,7736-7737,7764
-/branches/serial_port_improved:8119,8140-8141,8144,8150,8158-8160,8163,8170-8171
+/branches/serial_port_improved:8119,8140-8141,8144,8150,8158-8160,8163,8170-8171,8183,8185
/branches/ssh_ed25519:5495-5544
/branches/ttproxy_improved:8041,8055-8056
/branches/ttssh_improved:8027,8036,8040,8044,8053-8054,8058,8060,8063,8081,8085
Modified: trunk/doc/en/html/menu/setup-serialport.html
===================================================================
--- trunk/doc/en/html/menu/setup-serialport.html 2019-09-18 14:39:50 UTC (rev 8188)
+++ trunk/doc/en/html/menu/setup-serialport.html 2019-09-18 14:43:02 UTC (rev 8189)
@@ -18,7 +18,7 @@
<dt id="OK">OK button</dt>
<dd>
The label of OK button is changed refering to the connection state. <br>
- New connection ... Serial connection is launched with new window since TCP/IP connection is using. <br>
+ Connect with New window ... Serial connection is launched with new window since TCP/IP connection is using. <br>
New open ... Serial connection starts.<br>
Close and New open ... Current COM port is closed and serial connection starts with new COM port.<br>
New setting ... The setting of current COM port is changed.<br>
Modified: trunk/doc/ja/html/menu/setup-serialport.html
===================================================================
--- trunk/doc/ja/html/menu/setup-serialport.html 2019-09-18 14:39:50 UTC (rev 8188)
+++ trunk/doc/ja/html/menu/setup-serialport.html 2019-09-18 14:43:02 UTC (rev 8189)
@@ -17,10 +17,10 @@
<dt id="OK">OK button</dt>
<dd>
\x8C\xBB\x8D݂̐ڑ\xB1\x8F\xF3\x91Ԃ\xF0\x8C\xA9\x82āA\x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82̓\xAE\x8D\xEC\x82\xF0\x95\\x82\xB5\x82܂\xB7\x81B<br>
- \x90V\x82\xB5\x82\xA2\x90ڑ\xB1 ... TCP/IP\x90ڑ\xB1\x92\x86\x82̂\xBD\x82߁A\x90V\x82\xB5\x82\xA2\x83E\x83B\x83\x93\x83h\x83E\x82ŃV\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82\xF0\x8Ds\x82\xA2\x82܂\xB7\x81B<br>
+ \x90V\x82\xB5\x82\xA2\x83E\x83B\x83\x93\x83h\x83E\x82Őڑ\xB1 ... TCP/IP\x90ڑ\xB1\x92\x86\x82̂\xBD\x82߁A\x90V\x82\xB5\x82\xA2\x83E\x83B\x83\x93\x83h\x83E\x82ŃV\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82\xF0\x8Ds\x82\xA2\x82܂\xB7\x81B<br>
\x90V\x8BK\x83I\x81[\x83v\x83\x93 ... \x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82\xF0\x8Ds\x82\xA2\x82܂\xB7\x81B<br>
\x83N\x83\x8D\x81[\x83Y\x81\x95\x90V\x8BK\x83I\x81[\x83v\x83\x93 ... \x8C\xBB\x8D݊J\x82\xA2\x82Ă\xA2\x82\xE9COM\x83|\x81[\x83g\x82\xF0\x95\xB6\x82āA\x90V\x82\xB5\x82\xA2COM\x83|\x81[\x83g\x82ŃV\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82\xF0\x8Ds\x82\xA2\x82܂\xB7\x81B<br>
- \x8C\xBB\x8D݂̐ڑ\xB1\x82\xF0\x90ݒ胊\x83Z\x83b\x83g ... \x8C\xBB\x8D݊J\x82\xA2\x82Ă\xA2\x82\xE9COM\x83|\x81[\x83g\x82̐ݒ\xE8\x82\xF0\x95ύX\x82\xB5\x82܂\xB7\x81B<br>
+ \x8C\xBB\x8D݂̐ڑ\xB1\x82\xF0\x8DĐݒ\xE8 ... \x8C\xBB\x8D݊J\x82\xA2\x82Ă\xA2\x82\xE9COM\x83|\x81[\x83g\x82̐ݒ\xE8\x82\xF0\x95ύX\x82\xB5\x82܂\xB7\x81B<br>
</dd>
<dt id="Cancel">Cancel button</dt>
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2019-09-18 14:39:50 UTC (rev 8188)
+++ trunk/installer/release/lang/English.lng 2019-09-18 14:43:02 UTC (rev 8189)
@@ -370,7 +370,7 @@
DLG_SERIAL_DELAYCHAR=msec/&char
DLG_SERIAL_DELAYLINE=msec/&line
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
-DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_CONNECTION=Connect with &New window
DLG_SERIAL_OK_OPEN=&New open
DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
DLG_SERIAL_OK_RESET=&New setting
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2019-09-18 14:39:50 UTC (rev 8188)
+++ trunk/installer/release/lang/French.lng 2019-09-18 14:43:02 UTC (rev 8189)
@@ -371,7 +371,7 @@
DLG_SERIAL_DELAYCHAR=msec/&car
DLG_SERIAL_DELAYLINE=msec/&ligne
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
-DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_CONNECTION=Connect with &New window
DLG_SERIAL_OK_OPEN=&New open
DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
DLG_SERIAL_OK_RESET=&New setting
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2019-09-18 14:39:50 UTC (rev 8188)
+++ trunk/installer/release/lang/German.lng 2019-09-18 14:43:02 UTC (rev 8189)
@@ -371,7 +371,7 @@
DLG_SERIAL_DELAYCHAR=msec/char
DLG_SERIAL_DELAYLINE=msec/line
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
-DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_CONNECTION=Connect with &New window
DLG_SERIAL_OK_OPEN=&New open
DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
DLG_SERIAL_OK_RESET=&New setting
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2019-09-18 14:39:50 UTC (rev 8188)
+++ trunk/installer/release/lang/Japanese.lng 2019-09-18 14:43:02 UTC (rev 8189)
@@ -370,10 +370,10 @@
DLG_SERIAL_DELAYCHAR=\x83~\x83\x8A\x95b/\x8E\x9A(&C)
DLG_SERIAL_DELAYLINE=\x83~\x83\x8A\x95b/\x8Ds(&L)
DLG_SERIAL_SPEED_TOOLTIP=\x90\x94\x92l\x82ړ\xFC\x97͂ł\xAB\x82܂\xB7
-DLG_SERIAL_OK_CONNECTION=\x90V\x82\xB5\x82\xA2\x90ڑ\xB1(&N)
+DLG_SERIAL_OK_CONNECTION=\x90V\x82\xB5\x82\xA2\x83E\x83B\x83\x93\x83h\x83E\x82Őڑ\xB1(&N)
DLG_SERIAL_OK_OPEN=\x90V\x8BK\x83I\x81[\x83v\x83\x93(&N)
DLG_SERIAL_OK_CLOSEOPEN=\x83N\x83\x8D\x81[\x83Y\x81\x95\x90V\x8BK\x83I\x81[\x83v\x83\x93(&N)
-DLG_SERIAL_OK_RESET=\x8C\xBB\x8D݂̐ڑ\xB1\x82\xF0\x90ݒ胊\x83Z\x83b\x83g(&N)
+DLG_SERIAL_OK_RESET=\x8C\xBB\x8D݂̐ڑ\xB1\x82\xF0\x8DĐݒ\xE8(&N)
DLG_TCPIP_TITLE=Tera Term: TCP/IP \x90ݒ\xE8
DLG_TCPIP_HOSTLIST=\x83z\x83X\x83g\x83\x8A\x83X\x83g(&L)
Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng 2019-09-18 14:39:50 UTC (rev 8188)
+++ trunk/installer/release/lang/Korean.lng 2019-09-18 14:43:02 UTC (rev 8189)
@@ -371,7 +371,7 @@
DLG_SERIAL_DELAYCHAR=msec/&char
DLG_SERIAL_DELAYLINE=msec/&line
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
-DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_CONNECTION=Connect with &New window
DLG_SERIAL_OK_OPEN=&New open
DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
DLG_SERIAL_OK_RESET=&New setting
Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng 2019-09-18 14:39:50 UTC (rev 8188)
+++ trunk/installer/release/lang/Russian.lng 2019-09-18 14:43:02 UTC (rev 8189)
@@ -371,7 +371,7 @@
DLG_SERIAL_DELAYCHAR=\xEC\xF1/&\xF1\xE8\xEC\xE2\xEE\xEB
DLG_SERIAL_DELAYLINE=\xEC\xF1/&\xF1\xF2\xF0\xEE\xEA\xE0
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
-DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_CONNECTION=Connect with &New window
DLG_SERIAL_OK_OPEN=&New open
DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
DLG_SERIAL_OK_RESET=&New setting
Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng 2019-09-18 14:39:50 UTC (rev 8188)
+++ trunk/installer/release/lang/Simplified Chinese.lng 2019-09-18 14:43:02 UTC (rev 8189)
@@ -371,7 +371,7 @@
DLG_SERIAL_DELAYCHAR=\xBA\xC1\xC3\xEB/\xD7ַ\xFB
DLG_SERIAL_DELAYLINE=\xBA\xC1\xC3\xEB/\xD0\xD0
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
-DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_CONNECTION=Connect with &New window
DLG_SERIAL_OK_OPEN=&New open
DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
DLG_SERIAL_OK_RESET=&New setting
Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng 2019-09-18 14:39:50 UTC (rev 8188)
+++ trunk/installer/release/lang/Traditional Chinese.lng 2019-09-18 14:43:02 UTC (rev 8189)
@@ -371,7 +371,7 @@
DLG_SERIAL_DELAYCHAR=\xB2@\xAC\xED/\xA6r\xB2\xC5
DLG_SERIAL_DELAYLINE=\xB2@\xAC\xED/\xA6\xE6
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
-DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_CONNECTION=Connect with &New window
DLG_SERIAL_OK_OPEN=&New open
DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
DLG_SERIAL_OK_RESET=&New setting
Index: trunk/teraterm
===================================================================
--- trunk/teraterm 2019-09-18 14:39:50 UTC (rev 8188)
+++ trunk/teraterm 2019-09-18 14:43:02 UTC (rev 8189)
Property changes on: trunk/teraterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/drag_and_drop/teraterm:7130,7139,7141,7143-7147
/branches/flowctrl_dsrdtr/teraterm:7825-7827
-/branches/serial_port_improved/teraterm:8119,8140-8141,8144,8150,8158-8160,8163,8170
+/branches/serial_port_improved/teraterm:8119,8140-8141,8144,8150,8158-8160,8163,8170,8183,8185
/branches/vs2015_warn/teraterm:6194-6285
\ No newline at end of property
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c 2019-09-18 14:39:50 UTC (rev 8188)
+++ trunk/teraterm/ttpdlg/ttdlg.c 2019-09-18 14:43:02 UTC (rev 8189)
@@ -1136,7 +1136,7 @@
if ( cv.Ready && (cv.PortType != IdSerial) ) {
ret = SetDlgTexts(dlg, TextInfoNewConnection, _countof(TextInfoNewConnection), UILanguageFile);
- strncpy_s(uimsg, sizeof(uimsg), "&New connection", _TRUNCATE);
+ strncpy_s(uimsg, sizeof(uimsg), "Connect with &New window", _TRUNCATE);
} else {
if (cv.Open) {