Tera TermRevision: 7622
https://osdn.net/projects/ttssh2/scm/svn/commits/7622
Author: zmatsuo
Date: 2019-04-24 23:11:17 +0900 (Wed, 24 Apr 2019)
Log Message:
-----------
ttssh authダイアログi18n対応
Modified Paths:
--------------
branches/ssh_auth_dialog/installer/release/lang/English.lng
branches/ssh_auth_dialog/installer/release/lang/French.lng
branches/ssh_auth_dialog/installer/release/lang/German.lng
branches/ssh_auth_dialog/installer/release/lang/Japanese.lng
branches/ssh_auth_dialog/installer/release/lang/Korean.lng
branches/ssh_auth_dialog/installer/release/lang/Russian.lng
branches/ssh_auth_dialog/installer/release/lang/Simplified Chinese.lng
branches/ssh_auth_dialog/installer/release/lang/Traditional Chinese.lng
branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c
-------------- next part --------------
Modified: branches/ssh_auth_dialog/installer/release/lang/English.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/English.lng 2019-04-24 14:11:03 UTC (rev 7621)
+++ branches/ssh_auth_dialog/installer/release/lang/English.lng 2019-04-24 14:11:17 UTC (rev 7622)
@@ -581,7 +581,12 @@
DLG_AUTH_BANNER2=Authentication required.
DLG_AUTH_BANNER2_FAILED=Authentication failed. Please retry.
DLG_AUTH_USERNAME=User &name:
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
DLG_AUTH_PASSWORD=&Passphrase:
+DLG_AUTH_PASTE_CLIPBOARD=Paste from &clipboard
+DLG_AUTH_CLEAR_CLIPBOARD=Cl&ear clipboard after paste
+DLG_AUTH_USE_CONTORL_CHARACTERS=Use control charac&ters
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
DLG_AUTH_REMEMBER_PASSWORD=Remember password on &memory
DLG_AUTH_FWDAGENT=F&orward agent
DLG_AUTH_METHOD_PASSWORD=Use p&lain password to log in
Modified: branches/ssh_auth_dialog/installer/release/lang/French.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/French.lng 2019-04-24 14:11:03 UTC (rev 7621)
+++ branches/ssh_auth_dialog/installer/release/lang/French.lng 2019-04-24 14:11:17 UTC (rev 7622)
@@ -582,7 +582,12 @@
DLG_AUTH_BANNER2=Authentification requise.
DLG_AUTH_BANNER2_FAILED=Authentification \xE9chou\xE9e. R\xE9essayez.
DLG_AUTH_USERNAME=&Nom d'utilisateur:
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
DLG_AUTH_PASSWORD=&Phrase secr\xE8te:
+DLG_AUTH_PASTE_CLIPBOARD=Paste from &clipboard
+DLG_AUTH_CLEAR_CLIPBOARD=Cl&ear clipboard after paste
+DLG_AUTH_USE_CONTORL_CHARACTERS=Use control charac&ters
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
DLG_AUTH_REMEMBER_PASSWORD=Garder le mot de passe en &m\xE9moire
DLG_AUTH_FWDAGENT=F&orward agent
DLG_AUTH_METHOD_PASSWORD=Utiliser mot de passe pour la connexion
Modified: branches/ssh_auth_dialog/installer/release/lang/German.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/German.lng 2019-04-24 14:11:03 UTC (rev 7621)
+++ branches/ssh_auth_dialog/installer/release/lang/German.lng 2019-04-24 14:11:17 UTC (rev 7622)
@@ -582,7 +582,12 @@
DLG_AUTH_BANNER2=Authentifikation notwendig.
DLG_AUTH_BANNER2_FAILED=Authentifikation fehlgeschlagen. Bitte versuchen Sie es erneut.
DLG_AUTH_USERNAME=Benutzername:
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
DLG_AUTH_PASSWORD=Passphrase:
+DLG_AUTH_PASTE_CLIPBOARD=Paste from &clipboard
+DLG_AUTH_CLEAR_CLIPBOARD=Cl&ear clipboard after paste
+DLG_AUTH_USE_CONTORL_CHARACTERS=Use control charac&ters
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
DLG_AUTH_REMEMBER_PASSWORD=Passphrase speichern
DLG_AUTH_FWDAGENT=F&orward agent
DLG_AUTH_METHOD_PASSWORD=Passwortauthentifikation verwenden
Modified: branches/ssh_auth_dialog/installer/release/lang/Japanese.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/Japanese.lng 2019-04-24 14:11:03 UTC (rev 7621)
+++ branches/ssh_auth_dialog/installer/release/lang/Japanese.lng 2019-04-24 14:11:17 UTC (rev 7622)
@@ -581,7 +581,12 @@
DLG_AUTH_BANNER2=\x94F\x8F\xAA\x95K\x97v\x82ł\xB7.
DLG_AUTH_BANNER2_FAILED=\x94F\x8FɎ\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD. \x8DĎ\x8E\x8Ds\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2.
DLG_AUTH_USERNAME=\x83\x86\x81[\x83U\x96\xBC(&N):
+DLG_AUTH_PASTE_WINDOWS_USERNAME=\x83V\x83X\x83e\x83\x80\x83\x86\x81[\x83U\x81[\x96\xBC\x82\xF0\x83y\x81[\x83X\x83g(&W)
DLG_AUTH_PASSWORD=\x83p\x83X\x83t\x83\x8C\x81[\x83Y(&P):
+DLG_AUTH_PASTE_CLIPBOARD=\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x83y\x81[\x83X\x83g(&C)
+DLG_AUTH_CLEAR_CLIPBOARD=\x83y\x81[\x83X\x83g\x8C\xE3\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xF0\x83N\x83\x8A\x83A\x82\xB7\x82\xE9(&E)
+DLG_AUTH_USE_CONTORL_CHARACTERS=\x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82ɐ\xA7\x8C\xE4\x83R\x81[\x83h\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9(&T)
+DLG_AUTH_SHOW_PASSPHRASE=\x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9(&S)
DLG_AUTH_REMEMBER_PASSWORD=\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x83\x81\x83\x82\x83\x8A\x8F\xE3\x82ɋL\x89\xAF\x82\xB7\x82\xE9(&M)
DLG_AUTH_FWDAGENT=\x83G\x81[\x83W\x83F\x83\x93\x83g\x93]\x91\x97\x82\xB7\x82\xE9(&O)
DLG_AUTH_METHOD_PASSWORD=\x83v\x83\x8C\x83C\x83\x93\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x8Eg\x82\xA4(&L)
Modified: branches/ssh_auth_dialog/installer/release/lang/Korean.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/Korean.lng 2019-04-24 14:11:03 UTC (rev 7621)
+++ branches/ssh_auth_dialog/installer/release/lang/Korean.lng 2019-04-24 14:11:17 UTC (rev 7622)
@@ -582,10 +582,15 @@
DLG_AUTH_BANNER2=\xC0\xCE\xC1\xF5\xC0\xCC \xC7ʿ\xE4\xC7\xD4.
DLG_AUTH_BANNER2_FAILED=\xC0\xCF\xC1\xF5 \xBD\xC7\xC6\xD0. \xB4ٽ\xC3 \xBDõ\xB5\xC7\xD8\xC1ּ\xBC\xBF\xE4.
DLG_AUTH_USERNAME=\xBB\xE7\xBF\xEB\xC0\xDA \xC0̸\xA7(&N):
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
DLG_AUTH_PASSWORD=\xBE\xCFȣ(&P):
DLG_AUTH_REMEMBER_PASSWORD=\xB8\xA1 \xBE\xCFȣ\xB1\xE2\xBE\xEF(&M)
DLG_AUTH_FWDAGENT=\xBF\xA1\xC0\xCC\xC0\xFCƮ\xB7\xCE \xC0\xFC\xB4\xDE(&O)
DLG_AUTH_METHOD_PASSWORD=\xC0Ϲ\xDD\xC5ؽ\xBAƮ \xBE\xCFȣ \xB7α\xD7\xC0\xCE(&L)
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
+DLG_AUTH_REMEMBER_PASSWORD=Remember password on &memory
+DLG_AUTH_FWDAGENT=F&orward agent
+DLG_AUTH_METHOD_PASSWORD=Use p&lain password to log in
DLG_AUTH_METHOD_RSA=RSA/DSA/ECDSA/ED25519 Ű \xB7α\xD7\xC0\xCE(&R)
DLG_AUTH_METHOD_RHOST=rhosts \xB7α\xD7\xC0\xCE(SSH1)(&H)
;DLG_AUTH_METHOD_CHALLENGE1=\xBDõ\xB5/\xC0\xC0\xB4\xE4 \xB7α\xD7\xC0\xCE(TIS)(&T)
Modified: branches/ssh_auth_dialog/installer/release/lang/Russian.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/Russian.lng 2019-04-24 14:11:03 UTC (rev 7621)
+++ branches/ssh_auth_dialog/installer/release/lang/Russian.lng 2019-04-24 14:11:17 UTC (rev 7622)
@@ -582,7 +582,12 @@
DLG_AUTH_BANNER2=\xD2\xF0\xE5\xE1\xF3\xE5\xF2\xF1\xFF \xE0\xF3\xF2\xE5\xED\xF2\xE8\xF4\xE8\xEA\xE0\xF6\xE8\xFF.
DLG_AUTH_BANNER2_FAILED=\xCE\xF8\xE8\xE1\xEA\xE0 \xE0\xF3\xF2\xE5\xED\xF2\xE8\xF4\xE8\xEA\xE0\xF6\xE8\xE8. \xCF\xEE\xE2\xF2\xEE\xF0\xE8\xF2\xE5 \xEF\xEE\xEF\xFB\xF2\xEA\xF3.
DLG_AUTH_USERNAME=&\xC8\xEC\xFF \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFF:
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
DLG_AUTH_PASSWORD=&\xD4\xF0\xE0\xE7\xE0 \xEF\xE0\xF0\xEE\xEB\xFF:
+DLG_AUTH_PASTE_CLIPBOARD=Paste from &clipboard
+DLG_AUTH_CLEAR_CLIPBOARD=Cl&ear clipboard after paste
+DLG_AUTH_USE_CONTORL_CHARACTERS=Use control charac&ters
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
DLG_AUTH_REMEMBER_PASSWORD=&\xC7\xE0\xEF\xEE\xEC\xED\xE8\xF2\xFC \xEF\xE0\xF0\xEE\xEB\xFC \xE2 \xEF\xE0\xEC\xFF\xF2\xE8
DLG_AUTH_FWDAGENT=&\xCF\xE5\xF0\xE2\xFB\xE9 \xE0\xE3\xE5\xED\xF2
DLG_AUTH_METHOD_PASSWORD=&\xC2\xF5\xEE\xE4 \xF1 \xEF\xF0\xEE\xF1\xF2\xFB\xEC \xEF\xE0\xF0\xEE\xEB\xE5\xEC
Modified: branches/ssh_auth_dialog/installer/release/lang/Simplified Chinese.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/Simplified Chinese.lng 2019-04-24 14:11:03 UTC (rev 7621)
+++ branches/ssh_auth_dialog/installer/release/lang/Simplified Chinese.lng 2019-04-24 14:11:17 UTC (rev 7622)
@@ -582,7 +582,12 @@
DLG_AUTH_BANNER2=\xD0\xE8Ҫ\xC8\xCF֤\xA1\xA3
DLG_AUTH_BANNER2_FAILED=\xC8\xCF֤ʧ\xB0ܣ\xAC\xC7\xEB\xD6\xD8\xCAԡ\xA3
DLG_AUTH_USERNAME=\xD3û\xA7\xC3\xFB(&N)\xA3\xBA
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
DLG_AUTH_PASSWORD=\xC3\xDC\xC2\xEB(&P)\xA3\xBA
+DLG_AUTH_PASTE_CLIPBOARD=Paste from &clipboard
+DLG_AUTH_CLEAR_CLIPBOARD=Cl&ear clipboard after paste
+DLG_AUTH_USE_CONTORL_CHARACTERS=Use control charac&ters
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
DLG_AUTH_REMEMBER_PASSWORD=\xBC\xC7ס\xC3\xDC\xC2\xEB(&M)
DLG_AUTH_FWDAGENT=\xB4\xFA\xC0\xEDת\xB7\xA2(&O)
DLG_AUTH_METHOD_PASSWORD=ʹ\xD3ü\xC4\xC3\xDC\xC2\xEB\xC0\xB4\xB5\xC7¼(&L)
Modified: branches/ssh_auth_dialog/installer/release/lang/Traditional Chinese.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/Traditional Chinese.lng 2019-04-24 14:11:03 UTC (rev 7621)
+++ branches/ssh_auth_dialog/installer/release/lang/Traditional Chinese.lng 2019-04-24 14:11:17 UTC (rev 7622)
@@ -582,7 +582,12 @@
DLG_AUTH_BANNER2=\xBBݭn\xBB{\xC3ҡC
DLG_AUTH_BANNER2_FAILED=\xBB{\xC3ҥ\xA2\xB1ѡA\xBDЭ\xAB\xB8աC
DLG_AUTH_USERNAME=\xA5Τ\xE1\xA6W(&N)\xA1G
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
DLG_AUTH_PASSWORD=\xB1K\xBDX(&P)\xA1G
+DLG_AUTH_PASTE_CLIPBOARD=Paste from &clipboard
+DLG_AUTH_CLEAR_CLIPBOARD=Cl&ear clipboard after paste
+DLG_AUTH_USE_CONTORL_CHARACTERS=Use control charac&ters
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
DLG_AUTH_REMEMBER_PASSWORD=\xB0O\xA6\xED\xB1K\xBDX(&M)
DLG_AUTH_FWDAGENT=\xA5N\xB2z\xC2\xE0\xB5o(&O)
DLG_AUTH_METHOD_PASSWORD=\xA8ϥ\xCE²\xB3檺\xB1K\xBDX\xA8ӵn\xBF\xFD(&L)
Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c 2019-04-24 14:11:03 UTC (rev 7621)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c 2019-04-24 14:11:17 UTC (rev 7622)
@@ -255,7 +255,12 @@
{ IDC_SSHAUTHBANNER, "DLG_AUTH_BANNER" },
{ IDC_SSHAUTHBANNER2, "DLG_AUTH_BANNER2" },
{ IDC_SSHUSERNAMELABEL, "DLG_AUTH_USERNAME" },
+ { IDC_FROM_GETUSERNAME, "DLG_AUTH_PASTE_WINDOWS_USERNAME" },
{ IDC_SSHPASSWORDCAPTION, "DLG_AUTH_PASSWORD" },
+ { IDC_FROM_CLIPBOARD, "DLG_AUTH_PASTE_CLIPBOARD" },
+ { IDC_CLEAR_CLIPBOARD, "DLG_AUTH_CLEAR_CLIPBOARD" },
+ { IDC_USE_CONTROL_CHARACTER, "DLG_AUTH_USE_CONTORL_CHARACTERS" },
+ { IDC_SHOW_PASSPHRASE, "DLG_AUTH_SHOW_PASSPHRASE" },
{ IDC_REMEMBER_PASSWORD, "DLG_AUTH_REMEMBER_PASSWORD" },
{ IDC_FORWARD_AGENT, "DLG_AUTH_FWDAGENT" },
{ IDC_SSHUSEPASSWORD, "DLG_AUTH_METHOD_PASSWORD" },
@@ -262,10 +267,8 @@
{ IDC_SSHUSERSA, "DLG_AUTH_METHOD_RSA" },
{ IDC_SSHUSERHOSTS, "DLG_AUTH_METHOD_RHOST" },
{ IDC_SSHUSEPAGEANT, "DLG_AUTH_METHOD_PAGEANT" },
- //{ IDC_CHOOSERSAFILE, "DLG_AUTH_PRIVATEKEY" },
{ IDC_RSAFILENAMELABEL, "DLG_AUTH_PRIVATEKEY" },
{ IDC_LOCALUSERNAMELABEL, "DLG_AUTH_LOCALUSER" },
- //{ IDC_CHOOSEHOSTRSAFILE, "DLG_AUTH_HOST_PRIVATEKEY" },
{ IDC_HOSTRSAFILENAMELABEL, "DLG_AUTH_HOST_PRIVATEKEY" },
{ IDOK, "BTN_OK" },
{ IDCANCEL, "BTN_DISCONNECT" },
@@ -273,57 +276,6 @@
int default_method = pvar->session_settings.DefaultAuthMethod;
SetI18DlgStrs("TTSSH", dlg, text_info, _countof(text_info), pvar->ts->UILanguageFile);
-#if 0
- char uimsg[MAX_UIMSG];
- GetWindowText(dlg, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_TITLE", pvar, uimsg);
- SetWindowText(dlg, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDC_SSHAUTHBANNER, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_BANNER", pvar, uimsg);
- SetDlgItemText(dlg, IDC_SSHAUTHBANNER, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDC_SSHAUTHBANNER2, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_BANNER2", pvar, uimsg);
- SetDlgItemText(dlg, IDC_SSHAUTHBANNER2, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDC_SSHUSERNAMELABEL, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_USERNAME", pvar, uimsg);
- SetDlgItemText(dlg, IDC_SSHUSERNAMELABEL, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDC_SSHPASSWORDCAPTION, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_PASSWORD", pvar, uimsg);
- SetDlgItemText(dlg, IDC_SSHPASSWORDCAPTION, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDC_REMEMBER_PASSWORD, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_REMEMBER_PASSWORD", pvar, uimsg);
- SetDlgItemText(dlg, IDC_REMEMBER_PASSWORD, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDC_FORWARD_AGENT, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_FWDAGENT", pvar, uimsg);
- SetDlgItemText(dlg, IDC_FORWARD_AGENT, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDC_SSHUSEPASSWORD, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_METHOD_PASSWORD", pvar, uimsg);
- SetDlgItemText(dlg, IDC_SSHUSEPASSWORD, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDC_SSHUSERSA, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_METHOD_RSA", pvar, uimsg);
- SetDlgItemText(dlg, IDC_SSHUSERSA, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDC_SSHUSERHOSTS, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_METHOD_RHOST", pvar, uimsg);
- SetDlgItemText(dlg, IDC_SSHUSERHOSTS, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDC_SSHUSEPAGEANT, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_METHOD_PAGEANT", pvar, uimsg);
- SetDlgItemText(dlg, IDC_SSHUSEPAGEANT, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDC_CHOOSERSAFILE, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_PRIVATEKEY", pvar, uimsg);
- SetDlgItemText(dlg, IDC_CHOOSERSAFILE, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDC_LOCALUSERNAMELABEL, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_LOCALUSER", pvar, uimsg);
- SetDlgItemText(dlg, IDC_LOCALUSERNAMELABEL, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDC_CHOOSEHOSTRSAFILE, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_AUTH_HOST_PRIVATEKEY", pvar, uimsg);
- SetDlgItemText(dlg, IDC_CHOOSEHOSTRSAFILE, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDOK, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("BTN_OK", pvar, uimsg);
- SetDlgItemText(dlg, IDOK, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDCANCEL, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("BTN_DISCONNECT", pvar, uimsg);
- SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
-#endif
init_auth_machine_banner(pvar, dlg);
init_password_control(pvar, dlg, IDC_SSHPASSWORD);