[ttssh2-commit] [10582] SCP 関連のメッセージを国際化した

Zurück zum Archiv-Index
scmno****@osdn***** scmno****@osdn*****
2023年 2月 6日 (月) 08:28:28 JST


Revision: 10582
          https://osdn.net/projects/ttssh2/scm/svn/commits/10582
Author:   nmaya
Date:     2023-02-06 08:28:28 +0900 (Mon, 06 Feb 2023)
Log Message:
-----------
SCP 関連のメッセージを国際化した

ticket: #44168

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/44168

Modified Paths:
--------------
    trunk/installer/release/lang_utf8/English.lng
    trunk/installer/release/lang_utf8/French.lng
    trunk/installer/release/lang_utf8/German.lng
    trunk/installer/release/lang_utf8/Japanese.lng
    trunk/installer/release/lang_utf8/Korean.lng
    trunk/installer/release/lang_utf8/Russian.lng
    trunk/installer/release/lang_utf8/Simplified Chinese.lng
    trunk/installer/release/lang_utf8/Spanish.lng
    trunk/installer/release/lang_utf8/Traditional Chinese.lng
    trunk/ttssh2/ttxssh/resource.h
    trunk/ttssh2/ttxssh/ssh.c
    trunk/ttssh2/ttxssh/ttxssh.c
    trunk/ttssh2/ttxssh/ttxssh.rc

-------------- next part --------------
Modified: trunk/installer/release/lang_utf8/English.lng
===================================================================
--- trunk/installer/release/lang_utf8/English.lng	2023-02-05 23:28:17 UTC (rev 10581)
+++ trunk/installer/release/lang_utf8/English.lng	2023-02-05 23:28:28 UTC (rev 10582)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2023-01-18)
+; Updated by TeraTerm Project (2023-02-06)
 
 [Tera Term]
 DLG_SYSTEM_FONT=System,14,0
@@ -869,6 +869,26 @@
 DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
 DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
 
+; dlg SCP
+DLG_SCP_TITLE=TTSSH: Secure Copy Protocol (SCP)
+DLG_SCP_SENDFILE_FROM=&From:
+DLG_SCP_SENDFILE_TO=To:
+DLG_SCP_SENDFILE_DRAG=You can drag the file to this window.
+DLG_SCP_SENDFILE_SEND=&Send
+DLG_SCP_SENDFILE_CANCEL=&Cancel
+DLG_SCP_RECEIVEFILE_FROM=Fr&om:
+DLG_SCP_RECEIVEFILE_TO=To:
+DLG_SCP_RECEIVEFILE_RECEIVE=&Receive
+DLG_SCP_SELECT_FILE_TITLE=Choose a sending file with SCP
+DLG_SCP_SELECT_DEST_TITLE=Choose destination directory
+
+; dlg SCP progress
+DLG_SCP_PROGRESS_TITLE_SENDFILE=TTSSH: SCP sending file
+DLG_SCP_PROGRESS_TITLE_RECEIVEFILE=TTSSH: SCP receiving file
+DLG_SCP_PROGRESS_FILENAME_LABEL=Filename:
+DLG_SCP_PROGRESS_BYTES_LABEL=Bytes transfered:
+DLG_SCP_PROGRESS_TIME_LABEL=Time elapsed:
+
 ; crypt.c
 MSG_ENCRYPT_ERROR1=%s encrypt error(1): bytes %d (%d)
 MSG_ENCRYPT_ERROR2=%s encrypt error(2)
@@ -964,6 +984,14 @@
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s)
 MSG_SSH_AGENTERROR_TITLE=Bad agent request
 MSG_SSH_AGENTERROR_TOOLARGE=Agent request size is too large, ignore it.
+MSG_SSH_SCP_FILEOPEN_ERROR_TITLE=TTSSH: file open error
+MSG_SSH_SCP_FILEOPEN_READ_ERROR=Can't open file for reading:
+MSG_SSH_SCP_FILEOPEN_READONLY_ERROR=`%s' file is read only.
+MSG_SSH_SCP_FILEOPEN_OVERWRITE_CONFIRM=`%s' file exists.\noverwrite it?
+MSG_SSH_SCP_FILEOPEN_WRITE_ERROR=Can't open file for writing:
+MSG_SSH_SCP_CONFIRM_TITLE=TTSSH: confirm
+MSG_SSH_SCP_ERROR_TITLE=TTSSH: SCP error
+MSG_SSH_SCP_ERROR_INIT_TITLE=TTSSH: SCP error (SCP_INIT)
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=Unrecognized command-line option: %s

Modified: trunk/installer/release/lang_utf8/French.lng
===================================================================
--- trunk/installer/release/lang_utf8/French.lng	2023-02-05 23:28:17 UTC (rev 10581)
+++ trunk/installer/release/lang_utf8/French.lng	2023-02-05 23:28:28 UTC (rev 10582)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2023-01-18)
+; Updated by TeraTerm Project (2023-02-06)
 ; Last translated (French language) by Francois MOCQ (2010-07-21)
 
 [Tera Term]
@@ -873,6 +873,26 @@
 DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
 DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
 
+; dlg SCP
+DLG_SCP_TITLE=TTSSH: Secure Copy Protocol (SCP)
+DLG_SCP_SENDFILE_FROM=&From:
+DLG_SCP_SENDFILE_TO=To:
+DLG_SCP_SENDFILE_DRAG=You can drag the file to this window.
+DLG_SCP_SENDFILE_SEND=&Send
+DLG_SCP_SENDFILE_CANCEL=&Cancel
+DLG_SCP_RECEIVEFILE_FROM=Fr&om:
+DLG_SCP_RECEIVEFILE_TO=To:
+DLG_SCP_RECEIVEFILE_RECEIVE=&Receive
+DLG_SCP_SELECT_FILE_TITLE=Choose a sending file with SCP
+DLG_SCP_SELECT_DEST_TITLE=Choose destination directory
+
+; dlg SCP progress
+DLG_SCP_PROGRESS_TITLE_SENDFILE=TTSSH: SCP sending file
+DLG_SCP_PROGRESS_TITLE_RECEIVEFILE=TTSSH: SCP receiving file
+DLG_SCP_PROGRESS_FILENAME_LABEL=Filename:
+DLG_SCP_PROGRESS_BYTES_LABEL=Bytes transfered:
+DLG_SCP_PROGRESS_TIME_LABEL=Time elapsed:
+
 ; crypt.c
 MSG_ENCRYPT_ERROR1=%s erreur cryptage(1): octets %d (%d)
 MSG_ENCRYPT_ERROR2=%s erreur cryptage(2)
@@ -968,6 +988,14 @@
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s)
 MSG_SSH_AGENTERROR_TITLE=Bad agent request
 MSG_SSH_AGENTERROR_TOOLARGE=Agent request size is too large, ignore it.
+MSG_SSH_SCP_FILEOPEN_ERROR_TITLE=TTSSH: file open error
+MSG_SSH_SCP_FILEOPEN_READ_ERROR=Can't open file for reading:
+MSG_SSH_SCP_FILEOPEN_READONLY_ERROR=`%s' file is read only.
+MSG_SSH_SCP_FILEOPEN_OVERWRITE_CONFIRM=`%s' file exists.\noverwrite it?
+MSG_SSH_SCP_FILEOPEN_WRITE_ERROR=Can't open file for writing:
+MSG_SSH_SCP_CONFIRM_TITLE=TTSSH: confirm
+MSG_SSH_SCP_ERROR_TITLE=TTSSH: SCP error
+MSG_SSH_SCP_ERROR_INIT_TITLE=TTSSH: SCP error (SCP_INIT)
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=Option inconnue sur la ligne de commande: %s

Modified: trunk/installer/release/lang_utf8/German.lng
===================================================================
--- trunk/installer/release/lang_utf8/German.lng	2023-02-05 23:28:17 UTC (rev 10581)
+++ trunk/installer/release/lang_utf8/German.lng	2023-02-05 23:28:28 UTC (rev 10582)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2023-01-18)
+; Updated by TeraTerm Project (2023-02-06)
 ; Last translated (German language) by Frederik Schwarzer (2010-05-17)
 
 [Tera Term]
@@ -865,6 +865,26 @@
 DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
 DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
 
+; dlg SCP
+DLG_SCP_TITLE=TTSSH: Secure Copy Protocol (SCP)
+DLG_SCP_SENDFILE_FROM=&From:
+DLG_SCP_SENDFILE_TO=To:
+DLG_SCP_SENDFILE_DRAG=You can drag the file to this window.
+DLG_SCP_SENDFILE_SEND=&Send
+DLG_SCP_SENDFILE_CANCEL=&Cancel
+DLG_SCP_RECEIVEFILE_FROM=Fr&om:
+DLG_SCP_RECEIVEFILE_TO=To:
+DLG_SCP_RECEIVEFILE_RECEIVE=&Receive
+DLG_SCP_SELECT_FILE_TITLE=Choose a sending file with SCP
+DLG_SCP_SELECT_DEST_TITLE=Choose destination directory
+
+; dlg SCP progress
+DLG_SCP_PROGRESS_TITLE_SENDFILE=TTSSH: SCP sending file
+DLG_SCP_PROGRESS_TITLE_RECEIVEFILE=TTSSH: SCP receiving file
+DLG_SCP_PROGRESS_FILENAME_LABEL=Filename:
+DLG_SCP_PROGRESS_BYTES_LABEL=Bytes transfered:
+DLG_SCP_PROGRESS_TIME_LABEL=Time elapsed:
+
 ; crypt.c
 MSG_ENCRYPT_ERROR1=%s encrypt error(1): bytes %d (%d)
 MSG_ENCRYPT_ERROR2=%s encrypt error(2)
@@ -960,6 +980,14 @@
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s)
 MSG_SSH_AGENTERROR_TITLE=Bad agent request
 MSG_SSH_AGENTERROR_TOOLARGE=Agent request size is too large, ignore it.
+MSG_SSH_SCP_FILEOPEN_ERROR_TITLE=TTSSH: file open error
+MSG_SSH_SCP_FILEOPEN_READ_ERROR=Can't open file for reading:
+MSG_SSH_SCP_FILEOPEN_READONLY_ERROR=`%s' file is read only.
+MSG_SSH_SCP_FILEOPEN_OVERWRITE_CONFIRM=`%s' file exists.\noverwrite it?
+MSG_SSH_SCP_FILEOPEN_WRITE_ERROR=Can't open file for writing:
+MSG_SSH_SCP_CONFIRM_TITLE=TTSSH: confirm
+MSG_SSH_SCP_ERROR_TITLE=TTSSH: SCP error
+MSG_SSH_SCP_ERROR_INIT_TITLE=TTSSH: SCP error (SCP_INIT)
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=Unbekannte Befehlszeilen-Option: %s

Modified: trunk/installer/release/lang_utf8/Japanese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Japanese.lng	2023-02-05 23:28:17 UTC (rev 10581)
+++ trunk/installer/release/lang_utf8/Japanese.lng	2023-02-05 23:28:28 UTC (rev 10582)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2023-01-18)
+; Updated by TeraTerm Project (2023-02-06)
 
 [Tera Term]
 DLG_SYSTEM_FONT=MS Pゴシック,12,128
@@ -872,6 +872,24 @@
 DLG_HOSTKEY_ROTATION_ADD=%u個の新しいホスト鍵:
 DLG_HOSTKEY_ROTATION_REMOVE=%u個の廃止されたホスト鍵:
 
+; dlg SCP
+DLG_SCP_TITLE=TTSSH: Secure Copy Protocol (SCP)
+DLG_SCP_SENDFILE_FROM=&From:
+DLG_SCP_SENDFILE_TO=To:
+DLG_SCP_SENDFILE_DRAG=このウィンドウにファイルをドラッグできます
+DLG_SCP_SENDFILE_SEND=送信(&S)
+DLG_SCP_SENDFILE_CANCEL=キャンセル(&C)
+DLG_SCP_RECEIVEFILE_FROM=Fr&om:
+DLG_SCP_RECEIVEFILE_TO=To:
+DLG_SCP_RECEIVEFILE_RECEIVE=受信(&R)
+
+; dlg SCP progress
+DLG_SCP_PROGRESS_TITLE_SENDFILE=TTSSH: SCP ファイル送信中
+DLG_SCP_PROGRESS_TITLE_RECEIVEFILE=TTSSH: SCP ファイル受信中
+DLG_SCP_PROGRESS_FILENAME_LABEL=ファイル名:
+DLG_SCP_PROGRESS_BYTES_LABEL=転送済み:
+DLG_SCP_PROGRESS_TIME_LABEL=経過時間:
+
 ; crypt.c
 MSG_ENCRYPT_ERROR1=%s暗号化エラー(1): bytes %d (%d)
 MSG_ENCRYPT_ERROR2=%s暗号化エラー(2)
@@ -967,6 +985,14 @@
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=サブシステムの要求が失敗しました. (%s)
 MSG_SSH_AGENTERROR_TITLE=不正なエージェント要求
 MSG_SSH_AGENTERROR_TOOLARGE=エージェント要求のメッセージが大きすぎるので無視します.
+MSG_SSH_SCP_FILEOPEN_ERROR_TITLE=TTSSH: ファイルオープンエラー
+MSG_SSH_SCP_FILEOPEN_READ_ERROR=読み取り用にファイルを開けません:
+MSG_SSH_SCP_FILEOPEN_READONLY_ERROR=ファイル `%s' は読み取り専用です.
+MSG_SSH_SCP_FILEOPEN_OVERWRITE_CONFIRM=ファイル `%s' が存在します.\n上書きしますか?
+MSG_SSH_SCP_FILEOPEN_WRITE_ERROR=書き込み用にファイルを開けません:
+MSG_SSH_SCP_CONFIRM_TITLE=TTSSH: 確認
+MSG_SSH_SCP_ERROR_TITLE=TTSSH: SCP エラー
+MSG_SSH_SCP_ERROR_INIT_TITLE=TTSSH: SCP エラー (SCP_INIT)
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=無効なコマンドラインオプション: %s

Modified: trunk/installer/release/lang_utf8/Korean.lng
===================================================================
--- trunk/installer/release/lang_utf8/Korean.lng	2023-02-05 23:28:17 UTC (rev 10581)
+++ trunk/installer/release/lang_utf8/Korean.lng	2023-02-05 23:28:28 UTC (rev 10582)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2023-01-18)
+; Updated by TeraTerm Project (2023-02-06)
 ; Last translated (Korean language) by Daehong Kim (2013-07-25)
 
 [Tera Term]
@@ -873,6 +873,26 @@
 DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
 DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
 
+; dlg SCP
+DLG_SCP_TITLE=TTSSH: Secure Copy Protocol (SCP)
+DLG_SCP_SENDFILE_FROM=&From:
+DLG_SCP_SENDFILE_TO=To:
+DLG_SCP_SENDFILE_DRAG=You can drag the file to this window.
+DLG_SCP_SENDFILE_SEND=&Send
+DLG_SCP_SENDFILE_CANCEL=&Cancel
+DLG_SCP_RECEIVEFILE_FROM=Fr&om:
+DLG_SCP_RECEIVEFILE_TO=To:
+DLG_SCP_RECEIVEFILE_RECEIVE=&Receive
+DLG_SCP_SELECT_FILE_TITLE=Choose a sending file with SCP
+DLG_SCP_SELECT_DEST_TITLE=Choose destination directory
+
+; dlg SCP progress
+DLG_SCP_PROGRESS_TITLE_SENDFILE=TTSSH: SCP sending file
+DLG_SCP_PROGRESS_TITLE_RECEIVEFILE=TTSSH: SCP receiving file
+DLG_SCP_PROGRESS_FILENAME_LABEL=Filename:
+DLG_SCP_PROGRESS_BYTES_LABEL=Bytes transfered:
+DLG_SCP_PROGRESS_TIME_LABEL=Time elapsed:
+
 ; crypt.c
 MSG_ENCRYPT_ERROR1=%s 암호 오류(1): 바이트 %d (%d)
 MSG_ENCRYPT_ERROR2=%s 암호 오류(2)
@@ -968,6 +988,14 @@
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s)
 MSG_SSH_AGENTERROR_TITLE=Bad agent request
 MSG_SSH_AGENTERROR_TOOLARGE=Agent request size is too large, ignore it.
+MSG_SSH_SCP_FILEOPEN_ERROR_TITLE=TTSSH: file open error
+MSG_SSH_SCP_FILEOPEN_READ_ERROR=Can't open file for reading:
+MSG_SSH_SCP_FILEOPEN_READONLY_ERROR=`%s' file is read only.
+MSG_SSH_SCP_FILEOPEN_OVERWRITE_CONFIRM=`%s' file exists.\noverwrite it?
+MSG_SSH_SCP_FILEOPEN_WRITE_ERROR=Can't open file for writing:
+MSG_SSH_SCP_CONFIRM_TITLE=TTSSH: confirm
+MSG_SSH_SCP_ERROR_TITLE=TTSSH: SCP error
+MSG_SSH_SCP_ERROR_INIT_TITLE=TTSSH: SCP error (SCP_INIT)
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=인식되지 않는 명령행 옵션: %s

Modified: trunk/installer/release/lang_utf8/Russian.lng
===================================================================
--- trunk/installer/release/lang_utf8/Russian.lng	2023-02-05 23:28:17 UTC (rev 10581)
+++ trunk/installer/release/lang_utf8/Russian.lng	2023-02-05 23:28:28 UTC (rev 10582)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2023-01-18)
+; Updated by TeraTerm Project (2023-02-06)
 ; Last translated (Russian language) by Ryumik Sergey (2017-07-19)
 
 [Tera Term]
@@ -873,6 +873,26 @@
 DLG_HOSTKEY_ROTATION_ADD=%u новый ключ(и):
 DLG_HOSTKEY_ROTATION_REMOVE=%u старый ключ(и):
 
+; dlg SCP
+DLG_SCP_TITLE=TTSSH: Secure Copy Protocol (SCP)
+DLG_SCP_SENDFILE_FROM=&From:
+DLG_SCP_SENDFILE_TO=To:
+DLG_SCP_SENDFILE_DRAG=You can drag the file to this window.
+DLG_SCP_SENDFILE_SEND=&Send
+DLG_SCP_SENDFILE_CANCEL=&Cancel
+DLG_SCP_RECEIVEFILE_FROM=Fr&om:
+DLG_SCP_RECEIVEFILE_TO=To:
+DLG_SCP_RECEIVEFILE_RECEIVE=&Receive
+DLG_SCP_SELECT_FILE_TITLE=Choose a sending file with SCP
+DLG_SCP_SELECT_DEST_TITLE=Choose destination directory
+
+; dlg SCP progress
+DLG_SCP_PROGRESS_TITLE_SENDFILE=TTSSH: SCP sending file
+DLG_SCP_PROGRESS_TITLE_RECEIVEFILE=TTSSH: SCP receiving file
+DLG_SCP_PROGRESS_FILENAME_LABEL=Filename:
+DLG_SCP_PROGRESS_BYTES_LABEL=Bytes transfered:
+DLG_SCP_PROGRESS_TIME_LABEL=Time elapsed:
+
 ; crypt.c
 MSG_ENCRYPT_ERROR1=%s ошибка шифрования(1): байты %d (%d)
 MSG_ENCRYPT_ERROR2=%s ошибка шифрования(2)
@@ -968,6 +988,14 @@
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=Запрос подсистемы завершился неудачно. (%s)
 MSG_SSH_AGENTERROR_TITLE=Неверный запрос агента
 MSG_SSH_AGENTERROR_TOOLARGE=Запрос агента слишком велик, игнорируйте его.
+MSG_SSH_SCP_FILEOPEN_ERROR_TITLE=TTSSH: file open error
+MSG_SSH_SCP_FILEOPEN_READ_ERROR=Can't open file for reading:
+MSG_SSH_SCP_FILEOPEN_READONLY_ERROR=`%s' file is read only.
+MSG_SSH_SCP_FILEOPEN_OVERWRITE_CONFIRM=`%s' file exists.\noverwrite it?
+MSG_SSH_SCP_FILEOPEN_WRITE_ERROR=Can't open file for writing:
+MSG_SSH_SCP_CONFIRM_TITLE=TTSSH: confirm
+MSG_SSH_SCP_ERROR_TITLE=TTSSH: SCP error
+MSG_SSH_SCP_ERROR_INIT_TITLE=TTSSH: SCP error (SCP_INIT)
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=Неверный параметр в командной строке: %s

Modified: trunk/installer/release/lang_utf8/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Simplified Chinese.lng	2023-02-05 23:28:17 UTC (rev 10581)
+++ trunk/installer/release/lang_utf8/Simplified Chinese.lng	2023-02-05 23:28:28 UTC (rev 10582)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2023-01-18)
+; Updated by TeraTerm Project (2023-02-06)
 ; Last translated (Simplified Chinese language) by LiShaohui (2017-04-11)
 
 [Tera Term]
@@ -873,6 +873,26 @@
 DLG_HOSTKEY_ROTATION_ADD=%u 新密钥:
 DLG_HOSTKEY_ROTATION_REMOVE=%u 废弃密钥:
 
+; dlg SCP
+DLG_SCP_TITLE=TTSSH: Secure Copy Protocol (SCP)
+DLG_SCP_SENDFILE_FROM=&From:
+DLG_SCP_SENDFILE_TO=To:
+DLG_SCP_SENDFILE_DRAG=You can drag the file to this window.
+DLG_SCP_SENDFILE_SEND=&Send
+DLG_SCP_SENDFILE_CANCEL=&Cancel
+DLG_SCP_RECEIVEFILE_FROM=Fr&om:
+DLG_SCP_RECEIVEFILE_TO=To:
+DLG_SCP_RECEIVEFILE_RECEIVE=&Receive
+DLG_SCP_SELECT_FILE_TITLE=Choose a sending file with SCP
+DLG_SCP_SELECT_DEST_TITLE=Choose destination directory
+
+; dlg SCP progress
+DLG_SCP_PROGRESS_TITLE_SENDFILE=TTSSH: SCP sending file
+DLG_SCP_PROGRESS_TITLE_RECEIVEFILE=TTSSH: SCP receiving file
+DLG_SCP_PROGRESS_FILENAME_LABEL=Filename:
+DLG_SCP_PROGRESS_BYTES_LABEL=Bytes transfered:
+DLG_SCP_PROGRESS_TIME_LABEL=Time elapsed:
+
 ; crypt.c
 MSG_ENCRYPT_ERROR1=%s加密错误(1):bytes %d (%d)
 MSG_ENCRYPT_ERROR2=%s加密错误(2)

Modified: trunk/installer/release/lang_utf8/Spanish.lng
===================================================================
--- trunk/installer/release/lang_utf8/Spanish.lng	2023-02-05 23:28:17 UTC (rev 10581)
+++ trunk/installer/release/lang_utf8/Spanish.lng	2023-02-05 23:28:28 UTC (rev 10582)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2023-01-18)
+; Updated by TeraTerm Project (2023-02-06)
 ; Traducido por Filiberto Olguin Ascona.
 
 [Tera Term]
@@ -780,6 +780,26 @@
 DLG_HOSTKEY_DNSSEC_NG=Found insecure fingerprint in DNS.
 DLG_HOSTKEY_DNSSEC_OK=Found secure fingerprint in DNS.
 
+; dlg SCP
+DLG_SCP_TITLE=TTSSH: Secure Copy Protocol (SCP)
+DLG_SCP_SENDFILE_FROM=&From:
+DLG_SCP_SENDFILE_TO=To:
+DLG_SCP_SENDFILE_DRAG=You can drag the file to this window.
+DLG_SCP_SENDFILE_SEND=&Send
+DLG_SCP_SENDFILE_CANCEL=&Cancel
+DLG_SCP_RECEIVEFILE_FROM=Fr&om:
+DLG_SCP_RECEIVEFILE_TO=To:
+DLG_SCP_RECEIVEFILE_RECEIVE=&Receive
+DLG_SCP_SELECT_FILE_TITLE=Choose a sending file with SCP
+DLG_SCP_SELECT_DEST_TITLE=Choose destination directory
+
+; dlg SCP progress
+DLG_SCP_PROGRESS_TITLE_SENDFILE=TTSSH: SCP sending file
+DLG_SCP_PROGRESS_TITLE_RECEIVEFILE=TTSSH: SCP receiving file
+DLG_SCP_PROGRESS_FILENAME_LABEL=Filename:
+DLG_SCP_PROGRESS_BYTES_LABEL=Bytes transfered:
+DLG_SCP_PROGRESS_TIME_LABEL=Time elapsed:
+
 ; crypt.c
 MSG_ENCRYPT_ERROR1=%s encrypt error(1): bytes %d (%d)
 MSG_ENCRYPT_ERROR2=%s encrypt error(2)
@@ -865,6 +885,14 @@
 MSG_SSH_SERVER_UNSUPPORT_AUTH_METHOD_ERROR=\nAuthentication method is not supported by server.
 MSG_SSH_CHANNEL_OPEN_ERROR=SSH2_MSG_CHANNEL_OPEN_FAILURE was received.\nchannel [%d]: reason: %s(%d) message: %s
 MSG_SSH_NO_FREE_CHANNEL=Could not open new channel. TTSSH is already opening too many channels.
+MSG_SSH_SCP_FILEOPEN_ERROR_TITLE=TTSSH: file open error
+MSG_SSH_SCP_FILEOPEN_READ_ERROR=Can't open file for reading:
+MSG_SSH_SCP_FILEOPEN_READONLY_ERROR=`%s' file is read only.
+MSG_SSH_SCP_FILEOPEN_OVERWRITE_CONFIRM=`%s' file exists.\noverwrite it?
+MSG_SSH_SCP_FILEOPEN_WRITE_ERROR=Can't open file for writing:
+MSG_SSH_SCP_CONFIRM_TITLE=TTSSH: confirm
+MSG_SSH_SCP_ERROR_TITLE=TTSSH: SCP error
+MSG_SSH_SCP_ERROR_INIT_TITLE=TTSSH: SCP error (SCP_INIT)
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=Unrecognized command-line option: %s

Modified: trunk/installer/release/lang_utf8/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Traditional Chinese.lng	2023-02-05 23:28:17 UTC (rev 10581)
+++ trunk/installer/release/lang_utf8/Traditional Chinese.lng	2023-02-05 23:28:28 UTC (rev 10582)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2023-01-18)
+; Updated by TeraTerm Project (2023-02-06)
 ; Last translated (Traditional Chinese language) by kikiqqp (2014-09-20)
 
 [Tera Term]
@@ -870,6 +870,26 @@
 DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
 DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
 
+; dlg SCP
+DLG_SCP_TITLE=TTSSH: Secure Copy Protocol (SCP)
+DLG_SCP_SENDFILE_FROM=&From:
+DLG_SCP_SENDFILE_TO=To:
+DLG_SCP_SENDFILE_DRAG=You can drag the file to this window.
+DLG_SCP_SENDFILE_SEND=&Send
+DLG_SCP_SENDFILE_CANCEL=&Cancel
+DLG_SCP_RECEIVEFILE_FROM=Fr&om:
+DLG_SCP_RECEIVEFILE_TO=To:
+DLG_SCP_RECEIVEFILE_RECEIVE=&Receive
+DLG_SCP_SELECT_FILE_TITLE=Choose a sending file with SCP
+DLG_SCP_SELECT_DEST_TITLE=Choose destination directory
+
+; dlg SCP progress
+DLG_SCP_PROGRESS_TITLE_SENDFILE=TTSSH: SCP sending file
+DLG_SCP_PROGRESS_TITLE_RECEIVEFILE=TTSSH: SCP receiving file
+DLG_SCP_PROGRESS_FILENAME_LABEL=Filename:
+DLG_SCP_PROGRESS_BYTES_LABEL=Bytes transfered:
+DLG_SCP_PROGRESS_TIME_LABEL=Time elapsed:
+
 ; crypt.c
 MSG_ENCRYPT_ERROR1=%s加密錯誤(1): bytes %d (%d)
 MSG_ENCRYPT_ERROR2=%s加密錯誤(2)
@@ -965,6 +985,14 @@
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s)
 MSG_SSH_AGENTERROR_TITLE=Bad agent request
 MSG_SSH_AGENTERROR_TOOLARGE=Agent request size is too large, ignore it.
+MSG_SSH_SCP_FILEOPEN_ERROR_TITLE=TTSSH: file open error
+MSG_SSH_SCP_FILEOPEN_READ_ERROR=Can't open file for reading:
+MSG_SSH_SCP_FILEOPEN_READONLY_ERROR=`%s' file is read only.
+MSG_SSH_SCP_FILEOPEN_OVERWRITE_CONFIRM=`%s' file exists.\noverwrite it?
+MSG_SSH_SCP_FILEOPEN_WRITE_ERROR=Can't open file for writing:
+MSG_SSH_SCP_CONFIRM_TITLE=TTSSH: confirm
+MSG_SSH_SCP_ERROR_TITLE=TTSSH: SCP error
+MSG_SSH_SCP_ERROR_INIT_TITLE=TTSSH: SCP error (SCP_INIT)
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=無效的命令行選項:%s

Modified: trunk/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h	2023-02-05 23:28:17 UTC (rev 10581)
+++ trunk/ttssh2/ttxssh/resource.h	2023-02-05 23:28:28 UTC (rev 10582)
@@ -162,16 +162,17 @@
 #define IDC_SSHFWDLOCALTOREMOTE_CHECKIDENTITY 1089
 #define IDC_SENDFILE_SELECT             1090
 #define IDC_FILE_PROGRESS               1092
+#define IDC_SENDFILE_NOTE               1092
 #define IDC_FILENAME                    1093
 #define IDC_RECVDIR_SELECT              1093
 #define IDC_PROGRESS                    1094
-#define IDC_FN_STATIC                   1095
+#define IDC_SCP_PROGRESS_FILENAME_LABEL 1095
 #define IDC_RECVFILE                    1096
 #define IDC_RECV                        1097
 #define IDC_SFTP_TEST                   1098
 #define IDC_DUMMY_LINE                  1099
 #define IDC_LOCALUSERNAMELABEL          1100
-#define IDC_RECV_TO_DIRECTORY           1100
+#define IDC_RECVFILE_TO_LABEL           1100
 #define IDC_LOCALUSERNAME               1101
 #define IDC_RECVFILE_TO                 1101
 #define IDC_CHOOSEHOSTRSAFILE           1102
@@ -241,6 +242,11 @@
 #define IDC_SSHSETUP_HELP               1249
 #define IDC_SSHFWDSETUP_HELP            1250
 #define IDC_SSHAUTHSETUP_HELP           1251
+#define IDC_SENDFILE_FROM_LABEL         1252
+#define IDC_SENDFILE_TO_LABEL           1253
+#define IDC_RECEIVEFILE_FROM_LABEL      1254
+#define IDC_SCP_PROGRESS_BYTE_LABEL     1255
+#define IDC_SCP_PROGRESS_TIME_LABEL     1256
 
 // Next default values for new objects
 //
@@ -248,7 +254,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        118
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1252
+#define _APS_NEXT_CONTROL_VALUE         1257
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2023-02-05 23:28:17 UTC (rev 10581)
+++ trunk/ttssh2/ttxssh/ssh.c	2023-02-05 23:28:28 UTC (rev 10582)
@@ -4235,7 +4235,9 @@
 		if (fp == NULL) {
 			char buf[1024];
 			int len;
-			strcpy_s(buf, sizeof(buf), "Can't open file for reading: ");
+			UTIL_get_lang_msg("MSG_SSH_SCP_FILEOPEN_READ_ERROR", pvar,
+			                  "Can't open file for reading:");
+			_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s ", pvar->ts->UIMsg);
 			len = strlen(buf);
 			FormatMessage(
 			    FORMAT_MESSAGE_FROM_SYSTEM,
@@ -4245,7 +4247,9 @@
 			    buf+len,
 			    sizeof(buf)-len,
 			    NULL);
-			MessageBox(NULL, buf, "TTSSH: file open error", MB_OK | MB_ICONERROR);
+			UTIL_get_lang_msg("MSG_SSH_SCP_FILEOPEN_ERROR_TITLE", pvar,
+			                  "TTSSH: file open error");
+			MessageBox(NULL, buf, pvar->ts->UIMsg, MB_OK | MB_ICONERROR);
 			goto error;
 		}
 
@@ -4286,12 +4290,20 @@
 			char buf[512];
 			int dlgresult;
 			if (_access(c->scp.localfilefull, 0x02) == -1) { // 0x02 == writable
-				_snprintf_s(buf, sizeof(buf), _TRUNCATE, "`%s' file is read only.", c->scp.localfilefull);
-				MessageBox(NULL, buf, "TTSSH: file open error", MB_OK | MB_ICONERROR);
+				UTIL_get_lang_msg("MSG_SSH_SCP_FILEOPEN_READONLY_ERROR", pvar,
+				                  "`%s' file is read only.");
+				_snprintf_s(buf, sizeof(buf), _TRUNCATE, pvar->ts->UIMsg, c->scp.localfilefull);
+				UTIL_get_lang_msg("MSG_SSH_SCP_FILEOPEN_ERROR_TITLE", pvar,
+				                  "TTSSH: file open error");
+				MessageBox(NULL, buf, pvar->ts->UIMsg, MB_OK | MB_ICONERROR);
 				goto error;
 			}
-			_snprintf_s(buf, sizeof(buf), _TRUNCATE, "`%s' file exists.\noverwrite it?", c->scp.localfilefull);
-			dlgresult = MessageBox(NULL, buf, "TTSSH: confirm", MB_YESNO | MB_ICONQUESTION);
+			UTIL_get_lang_msg("MSG_SSH_SCP_FILEOPEN_OVERWRITE_CONFIRM", pvar,
+			                  "`%s' file exists.\noverwrite it?");
+			_snprintf_s(buf, sizeof(buf), _TRUNCATE, pvar->ts->UIMsg, c->scp.localfilefull);
+			UTIL_get_lang_msg("MSG_SSH_SCP_CONFIRM_TITLE", pvar,
+			                  "TTSSH: confirm");
+			dlgresult = MessageBox(NULL, buf, pvar->ts->UIMsg, MB_YESNO | MB_ICONQUESTION);
 			if (dlgresult == IDNO) {
 				goto error;
 			}
@@ -4301,7 +4313,9 @@
 		if (fp == NULL) {
 			char buf[1024];
 			int len;
-			strcpy_s(buf, sizeof(buf), "Can't open file for writing: ");
+			UTIL_get_lang_msg("MSG_SSH_SCP_FILEOPEN_WRITE_ERROR", pvar,
+			                  "Can't open file for writing:");
+			_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s ", pvar->ts->UIMsg);
 			len = strlen(buf);
 			FormatMessage(
 			    FORMAT_MESSAGE_FROM_SYSTEM,
@@ -4311,7 +4325,9 @@
 			    buf+len,
 			    sizeof(buf)-len,
 			    NULL);
-			MessageBox(NULL, buf, "TTSSH: file open error", MB_OK | MB_ICONERROR);
+			UTIL_get_lang_msg("MSG_SSH_SCP_FILEOPEN_ERROR_TITLE", pvar,
+			                  "TTSSH: file open error");
+			MessageBox(NULL, buf, pvar->ts->UIMsg, MB_OK | MB_ICONERROR);
 			goto error;
 		}
 
@@ -8318,8 +8334,16 @@
 		c->scp.pvar = pvar;
 
 		hDlgWnd = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SSHSCP_PROGRESS),
-				   pvar->cv->HWin, (DLGPROC)ssh_scp_dlg_proc);
+		                       pvar->cv->HWin, (DLGPROC)ssh_scp_dlg_proc);
 		if (hDlgWnd != NULL) {
+			static const DlgTextInfo text_info[] = {
+				{ 0, "DLG_SCP_PROGRESS_TITLE_SENDFILE" },
+				{ IDC_SCP_PROGRESS_FILENAME_LABEL, "DLG_SCP_PROGRESS_FILENAME_LABEL" },
+				{ IDC_SCP_PROGRESS_BYTE_LABEL, "DLG_SCP_PROGRESS_BYTES_LABEL" },
+				{ IDC_SCP_PROGRESS_TIME_LABEL, "DLG_SCP_PROGRESS_TIME_LABEL" },
+			};
+			SetI18nDlgStrsW(hDlgWnd, "TTSSH", text_info, _countof(text_info), pvar->ts->UILanguageFileW);
+
 			c->scp.progress_window = hDlgWnd;
 			ShowWindow(hDlgWnd, SW_SHOW);
 		}
@@ -8577,10 +8601,17 @@
 			// \x90i\x92\xBB\x83E\x83B\x83\x93\x83h\x83E
 			c->scp.pvar = pvar;
 			hDlgWnd = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SSHSCP_PROGRESS),
-					   pvar->cv->HWin, (DLGPROC)ssh_scp_dlg_proc);
+			                       pvar->cv->HWin, (DLGPROC)ssh_scp_dlg_proc);
 			if (hDlgWnd != NULL) {
+				static const DlgTextInfo text_info[] = {
+					{ 0, "DLG_SCP_PROGRESS_TITLE_RECEIVEFILE" },
+					{ IDC_SCP_PROGRESS_FILENAME_LABEL, "DLG_SCP_SENDFILE_FROM" },
+					{ IDC_SCP_PROGRESS_BYTE_LABEL, "DLG_SCP_PROGRESS_BYTES_LABEL" },
+					{ IDC_SCP_PROGRESS_TIME_LABEL, "DLG_SCP_PROGRESS_TIME_LABEL" },
+				};
+				SetI18nDlgStrsW(hDlgWnd, "TTSSH", text_info, _countof(text_info), pvar->ts->UILanguageFileW);
+
 				c->scp.progress_window = hDlgWnd;
-				SetWindowText(hDlgWnd, "TTSSH: SCP receiving file");
 				SendMessage(GetDlgItem(hDlgWnd, IDC_FILENAME), WM_SETTEXT, 0, (LPARAM)c->scp.localfilefull);
 				ShowWindow(hDlgWnd, SW_SHOW);
 			}
@@ -8602,8 +8633,10 @@
 			copylen = min(buflen, sizeof(msg));
 			memcpy(msg, data, copylen);
 			msg[copylen - 1] = 0;
-			MessageBox(NULL, msg, "TTSSH: SCP error(SCP_INIT)", MB_OK | MB_ICONEXCLAMATION);
 
+			UTIL_get_lang_msg("MSG_SSH_SCP_ERROR_INIT_TITLE", pvar,
+			                  "TTSSH: SCP error (SCP_INIT)");
+			MessageBox(NULL, msg, pvar->ts->UIMsg, MB_OK | MB_ICONEXCLAMATION);
 		}
 
 	} else if (c->scp.state == SCP_DATA) {  // payload\x82̎\xF3\x90M
@@ -8684,7 +8717,9 @@
 			//ssh2_channel_send_close(pvar, c);
 		}
 
-		MessageBox(NULL, msg, "TTSSH: SCP error", MB_OK | MB_ICONEXCLAMATION);
+		UTIL_get_lang_msg("MSG_SSH_SCP_ERROR_TITLE", pvar,
+		                  "TTSSH: SCP error");
+		MessageBox(NULL, msg, pvar->ts->UIMsg, MB_OK | MB_ICONEXCLAMATION);
 	}
 }
 

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2023-02-05 23:28:17 UTC (rev 10581)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2023-02-05 23:28:28 UTC (rev 10582)
@@ -3269,6 +3269,21 @@
 
 	switch (msg) {
 	case WM_INITDIALOG:
+		{
+			static const DlgTextInfo text_info[] = {
+				{ 0, "DLG_SCP_TITLE" },
+				{ IDC_SENDFILE_FROM_LABEL, "DLG_SCP_SENDFILE_FROM" },
+				{ IDC_SENDFILE_TO_LABEL, "DLG_SCP_SENDFILE_TO" },
+				{ IDC_SENDFILE_NOTE, "DLG_SCP_SENDFILE_DRAG" },
+				{ IDOK, "DLG_SCP_SENDFILE_SEND" },
+				{ IDCANCEL, "DLG_SCP_SENDFILE_CANCEL" },
+				{ IDC_RECEIVEFILE_FROM_LABEL, "DLG_SCP_RECEIVEFILE_FROM" },
+				{ IDC_RECVFILE_TO_LABEL, "DLG_SCP_RECEIVEFILE_TO" },
+				{ IDC_RECV, "DLG_SCP_RECEIVEFILE_RECEIVE" },
+			};
+			SetI18nDlgStrsW(dlg, "TTSSH", text_info, _countof(text_info), pvar->ts->UILanguageFileW);
+		}
+
 		DragAcceptFiles(dlg, TRUE);
 
 		// SCP\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x90\xE6\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9
@@ -3325,7 +3340,9 @@
 			get_lang_msg("FILEDLG_SELECT_LOGVIEW_APP_TITLE", uimsg, sizeof(uimsg),
 			             "Choose a executing file with launching logging file", ts.UILanguageFile);
 #endif
-			ofn.lpstrTitle = "Choose a sending file with SCP";
+			UTIL_get_lang_msg("DLG_SCP_SELECT_FILE_TITLE", pvar,
+			                  "Choose a sending file with SCP");
+			ofn.lpstrTitle = pvar->ts->UIMsg;
 
 			ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
 			ofn.Flags |= OFN_FORCESHOWHIDDEN;
@@ -3337,9 +3354,11 @@
 			return TRUE;
 		case IDC_RECVDIR_SELECT | (BN_CLICKED << 16):
 			{
-			wchar_t *buf, *buf2;
+			wchar_t *buf, *buf2, uimsg[MAX_UIMSG];
 			hGetDlgItemTextW(dlg, IDC_RECVFILE_TO, &buf);
-			if (doSelectFolderW(dlg, buf, L"Choose destination directory", &buf2)) {
+			UTIL_get_lang_msgW("DLG_SCP_SELECT_DEST_TITLE", pvar,
+			                   L"Choose destination directory", uimsg);
+			if (doSelectFolderW(dlg, buf, uimsg, &buf2)) {
 				WideCharToACP_t(buf2, recvdir, sizeof(recvdir));
 				SetDlgItemTextA(dlg, IDC_RECVFILE_TO, recvdir);
 				free(buf2);

Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc	2023-02-05 23:28:17 UTC (rev 10581)
+++ trunk/ttssh2/ttxssh/ttxssh.rc	2023-02-05 23:28:28 UTC (rev 10582)
@@ -351,40 +351,40 @@
 
 IDD_SSHSCP DIALOGEX 0, 0, 279, 125
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TTSSH: Secure File Copy"
+CAPTION "TTSSH: Secure Copy Protocol (SCP)"
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
-    LTEXT           "&From:",IDC_STATIC,10,8,20,8
-    EDITTEXT        IDC_SENDFILE_EDIT,35,7,156,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_SENDFILE_SELECT,196,7,14,14
-    LTEXT           "To:    remote host home directory",IDC_STATIC,18,25,16,8
-    EDITTEXT        IDC_SENDFILE_TO,35,24,156,14,ES_AUTOHSCROLL
-    LTEXT           "You can drag the file to this window.",IDC_FILE_PROGRESS,44,43,128,11,0,WS_EX_STATICEDGE
-    DEFPUSHBUTTON   "&Send",IDOK,222,7,50,14
-    PUSHBUTTON      "&Cancel",IDCANCEL,222,24,50,14
-    PUSHBUTTON      "SFTP Test",IDC_SFTP_TEST,222,45,50,14,NOT WS_VISIBLE
+    LTEXT           "&From:",IDC_SENDFILE_FROM_LABEL,10,8,30,8,0,WS_EX_RIGHT
+    EDITTEXT        IDC_SENDFILE_EDIT,45,7,150,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_SENDFILE_SELECT,200,7,14,14
+    LTEXT           "To:",IDC_SENDFILE_TO_LABEL,10,25,30,8,0,WS_EX_RIGHT
+    EDITTEXT        IDC_SENDFILE_TO,45,24,150,14,ES_AUTOHSCROLL
+    LTEXT           "You can drag the file to this window.",IDC_SENDFILE_NOTE,45,43,170,11
+    DEFPUSHBUTTON   "&Send",IDOK,223,7,50,14
+    PUSHBUTTON      "&Cancel",IDCANCEL,223,24,50,14
+    PUSHBUTTON      "SFTP Test",IDC_SFTP_TEST,223,45,50,14,NOT WS_VISIBLE
     LTEXT           "-----------------------------------------------------------------------------------------------------------",IDC_DUMMY_LINE,7,63,265,8
-    LTEXT           "Fr&om:",IDC_STATIC,7,81,20,8
-    EDITTEXT        IDC_RECVFILE,37,78,154,14,ES_AUTOHSCROLL
-    LTEXT           "To: ",IDC_RECV_TO_DIRECTORY,15,100,16,8
-    EDITTEXT        IDC_RECVFILE_TO,37,97,154,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_RECVDIR_SELECT,196,97,14,14
-    PUSHBUTTON      "&Receive",IDC_RECV,222,77,50,14
+    LTEXT           "Fr&om:",IDC_RECEIVEFILE_FROM_LABEL,10,81,30,8,0,WS_EX_RIGHT
+    EDITTEXT        IDC_RECVFILE,45,78,150,14,ES_AUTOHSCROLL
+    LTEXT           "To: ",IDC_RECVFILE_TO_LABEL,10,100,30,8,0,WS_EX_RIGHT
+    EDITTEXT        IDC_RECVFILE_TO,45,97,150,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_RECVDIR_SELECT,200,97,14,14
+    PUSHBUTTON      "&Receive",IDC_RECV,223,77,50,14
 END
 
-IDD_SSHSCP_PROGRESS DIALOGEX 0, 0, 166, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_SSHSCP_PROGRESS DIALOGEX 0, 0, 200, 100
+STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TTSSH: SCP sending file"
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
-    LTEXT           "Filename:",IDC_FN_STATIC,7,7,32,8
-    EDITTEXT        IDC_FILENAME,45,6,114,14,ES_AUTOHSCROLL | ES_READONLY
-    LTEXT           "Bytes:",IDC_STATIC,7,29,32,8
-    LTEXT           "0%",IDC_PROGRESS,40,29,141,8
-    LTEXT           "Time:",IDC_STATIC,7,39,32,8
-    LTEXT           "0:00",IDC_PROGTIME,40,39,141,8
-    CONTROL         "",IDC_PROGBAR,"msctls_progress32",WS_BORDER,7,52,152,14
-    DEFPUSHBUTTON   "Cancel",IDCANCEL,43,76,73,14
+    LTEXT           "Filename:",IDC_SCP_PROGRESS_FILENAME_LABEL,7,9,40,8
+    EDITTEXT        IDC_FILENAME,53,7,140,14,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "Bytes transfered:",IDC_SCP_PROGRESS_BYTE_LABEL,7,30,60,8
+    LTEXT           "0%",IDC_PROGRESS,73,30,117,8
+    LTEXT           "Time elapsed:",IDC_SCP_PROGRESS_TIME_LABEL,7,42,60,8
+    LTEXT           "0:00",IDC_PROGTIME,73,42,117,8
+    CONTROL         "",IDC_PROGBAR,"msctls_progress32",WS_BORDER,7,54,186,14
+    DEFPUSHBUTTON   "Cancel",IDCANCEL,70,80,60,14
 END
 
 IDD_SSHPASSWD_INPUT DIALOGEX 0, 0, 240, 102
@@ -576,7 +576,7 @@
     IDD_SSHSCP_PROGRESS, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 159
+        RIGHTMARGIN, 193
         TOPMARGIN, 7
         BOTTOMMARGIN, 93
     END
@@ -653,12 +653,18 @@
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_SECURETT            ICON                    "ttsecure.ico"
+
+IDI_SECURETT_CLASSIC    ICON                    "ttsecure_classic.ico"
+
 IDI_SECURETT_YELLOW     ICON                    "ttsecure_yellow.ico"
+
 IDI_SECURETT_GREEN      ICON                    "ttsecure_green.ico"
+
 IDI_DROPDOWN            ICON                    "dropdown.ico"
-IDI_SECURETT_CLASSIC    ICON                    "ttsecure_classic.ico"
+
 IDI_SECURETT_FLAT       ICON                    "ttsecure_flat.ico"
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // AFX_DIALOG_LAYOUT
@@ -674,6 +680,16 @@
     0x0000
 END
 
+IDD_SSHSCP AFX_DIALOG_LAYOUT 
+BEGIN
+    0x0000
+END
+
+IDD_SSHSCP_PROGRESS AFX_DIALOG_LAYOUT 
+BEGIN
+    0x0000
+END
+
 #endif    // \x89p\x8C\xEA (\x95č\x91) resources
 /////////////////////////////////////////////////////////////////////////////
 


ttssh2-commit メーリングリストの案内
Zurück zum Archiv-Index