端末設定ダイアログを1つに統合した #84

- lngファイルのコメント部分を表示できるようにした - lngファイルのコメント部分をinfoセクションで参照できるようにした - generalダイアログのlanguage設定を使用しないようにした(非表示にした)
TeraTermProject · Apr 12, 2024 · 0b8eb00 · 0b8eb00
1 parent 09b1faf
commit 0b8eb00
Show file tree

Hide file tree

Showing 19 changed files with 282 additions and 218 deletions.
diff --git a/doc/en/html/about/history.html b/doc/en/html/about/history.html
@@ -55,6 +55,7 @@ <h3 id="teraterm_5.3">YYYY.MM.DD (Ver 5.3 not released yet)</h3>
         </ul>
       </li>
       <li>Default port settings is moved to <a href="../menu/setup-additional.html#Port">General tab</a> of Additional settings dialog.</li>
+      <li>Display lng file information when <a href="../menu/setup-general.html#UILanguageFile">LanguageUI</a> is selected. Remove language setting.</li>
     </ul>
   </li>
 

diff --git a/doc/en/html/menu/setup-general.html b/doc/en/html/menu/setup-general.html
@@ -13,11 +13,6 @@ <h1>General ([Setup] menu)</h1>
 
     <h2>"General setup" dialog box</h2>
     <dl>
-      <dt id="Language">Language</dt>
-      <dd>
-	Language mode (English, Japanese, Korean, Russian, chinese or UTF-8) of the terminal emulation.
-      </dd>
-
       <dt id="UILanguageFile">LanguageUI</dt>
       <dd>
 	The message catalog(menu and dialog message) can be changed by specifying the language file(lang\*.lng).

diff --git a/doc/ja/html/about/history.html b/doc/ja/html/about/history.html
@@ -55,6 +55,7 @@ <h3 id="teraterm_5.3">YYYY.MM.DD (Ver 5.3 not released yet)</h3>
         </ul>
       </li>
       <li>Default port 設定を Additional settings の <a href="../menu/setup-additional.html#Port">General タブ</a>へ移動した。</li>
+      <li><a href="../menu/setup-general.html#UILanguageFile">LanguageUI</a>選択時にlngファイルの情報を表示するようにした。Language設定を削除した。</li>
     </ul>
   </li>
 

diff --git a/doc/ja/html/menu/setup-general.html b/doc/ja/html/menu/setup-general.html
@@ -13,15 +13,6 @@
 
     <h2>"General setup" ダイアログボックス</h2>
     <dl>
-      <dt id="Language">Language</dt>
-      <dd>
-	ターミナルエミュレーションの言語モード(英語/日本語/韓国語/ロシア語/中国語/UTF-8)。
-
-	日本語を表示するためには Japanese または UTF-8 を選択する必要があります。
-	日本語 EUC や SJIS 等の文字コードを利用することがある場合は Japanese を、
-	これらを使用せずに UTF-8 のみを使用する場合は UTF-8 を選択してください。
-      </dd>
-
       <dt id="UILanguageFile">LanguageUI</dt>
       <dd>
 	言語ファイル(lang\*.lng)の指定により、メニューやメッセージの言語を切り替えることができます。

diff --git a/installer/release/lang_utf8/Default.lng b/installer/release/lang_utf8/Default.lng
@@ -1,4 +1,9 @@
-[Tera Term]
+[Info]
+language=default
+date=
+contributor=
+
+[Tera Term]
 DLG_SYSTEM_FONT=System,12,0
 DLG_TAHOMA_FONT=Tahoma,8,0
 

diff --git a/installer/release/lang_utf8/English.lng b/installer/release/lang_utf8/English.lng
@@ -1,4 +1,7 @@
-; Updated by TeraTerm Project (2024-03-30)
+[Info]
+language=English
+date=2024-04-13 by TeraTerm Project
+contributor=-
 
 [Tera Term]
 DLG_SYSTEM_FONT=System,14,0
@@ -58,7 +61,7 @@ MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=&Keyboard...
 MENU_SETUP_SERIALPORT=S&erial port...
 MENU_SETUP_TCPIP=T&CP/IP...
-MENU_SETUP_GENERAL=&General...
+MENU_SETUP_GENERAL=&General(LanguageUI)...
 MENU_SETUP_ADDITION=A&dditional settings...
 MENU_SETUP_SAVE=&Save setup...
 MENU_SETUP_RESTORE=&Restore setup...

diff --git a/installer/release/lang_utf8/French.lng b/installer/release/lang_utf8/French.lng
@@ -1,5 +1,7 @@
-; Updated by TeraTerm Project (2024-03-30)
-; Last translated (French language) by Francois MOCQ (2010-07-21)
+[Info]
+language=French
+date=2024-04-13 by TeraTerm Project
+contributor=Francois MOCQ (2010-07-21)
 
 [Tera Term]
 DLG_SYSTEM_FONT=System,14,0
@@ -59,7 +61,7 @@ MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=&Clavier...
 MENU_SETUP_SERIALPORT=Port Serie...
 MENU_SETUP_TCPIP=T&CP/IP...
-MENU_SETUP_GENERAL=&General...
+MENU_SETUP_GENERAL=&General(LanguageUI)...
 MENU_SETUP_ADDITION=Plus de reglages...
 MENU_SETUP_SAVE=&Sauvegarder setup...
 MENU_SETUP_RESTORE=&Restaurer setup...

diff --git a/installer/release/lang_utf8/German.lng b/installer/release/lang_utf8/German.lng
@@ -1,5 +1,7 @@
-; Updated by TeraTerm Project (2024-03-30)
-; Last translated (German language) by Frederik Schwarzer (2010-05-17)
+[Info]
+language=German
+date=2024-04-13 by TeraTerm Project
+contributor=Frederik Schwarzer (2010-05-17)
 
 [Tera Term]
 DLG_SYSTEM_FONT=System,14,0
@@ -59,7 +61,7 @@ MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=&Keyboard-Einstellungen
 MENU_SETUP_SERIALPORT=Serieller Port
 MENU_SETUP_TCPIP=&Hostliste editieren
-MENU_SETUP_GENERAL=&Grundeinstellungen
+MENU_SETUP_GENERAL=&Grundeinstellungen(LanguageUI)
 MENU_SETUP_ADDITION=&Erweiterte Einstellungen
 MENU_SETUP_SAVE=&Setup sichern
 MENU_SETUP_RESTORE=&Setup laden

diff --git a/installer/release/lang_utf8/Japanese.lng b/installer/release/lang_utf8/Japanese.lng
@@ -1,4 +1,7 @@
-; Updated by TeraTerm Project (2024-03-30)
+[Info]
+language=Japanese(日本語)
+date=2024-04-13 by TeraTerm Project
+contributor=-
 
 [Tera Term]
 DLG_SYSTEM_FONT=ＭＳ Ｐゴシック,12,128
@@ -58,7 +61,7 @@ MENU_SETUP_DIALOG_FONT=ダイアログフォント(&D)...
 MENU_SETUP_KEYBOARD=キーボード(&K)...
 MENU_SETUP_SERIALPORT=シリアルポート(&E)...
 MENU_SETUP_TCPIP=T&CP/IP...
-MENU_SETUP_GENERAL=全般(&G)...
+MENU_SETUP_GENERAL=全般(LanguageUI)(&G)...
 MENU_SETUP_ADDITION=その他の設定(&D)...
 MENU_SETUP_SAVE=設定の保存(&S)...
 MENU_SETUP_RESTORE=設定の読み込み(&R)...

diff --git a/installer/release/lang_utf8/Korean.lng b/installer/release/lang_utf8/Korean.lng
@@ -1,5 +1,7 @@
-; Updated by TeraTerm Project (2024-03-30)
-; Last translated (Korean language) by Daehong Kim (2013-07-25)
+[Info]
+language=Korean
+date=2024-04-13 by TeraTerm Project
+contributor=Daehong Kim (2013-07-25)
 
 [Tera Term]
 DLG_SYSTEM_FONT=굴림,10,128
@@ -59,7 +61,7 @@ MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=키보드(&K)...
 MENU_SETUP_SERIALPORT=시리얼포트(&E)...
 MENU_SETUP_TCPIP=T&CP/IP...
-MENU_SETUP_GENERAL=일반(&G)...
+MENU_SETUP_GENERAL=일반(LanguageUI)(&G)...
 MENU_SETUP_ADDITION=추가설정(&D)...
 MENU_SETUP_SAVE=저장하기(&S)...
 MENU_SETUP_RESTORE=가져오기(&R)...

diff --git a/installer/release/lang_utf8/Russian.lng b/installer/release/lang_utf8/Russian.lng
@@ -1,5 +1,7 @@
-; Updated by TeraTerm Project (2024-03-30)
-; Last translated (Russian language) by Ryumik Sergey (2017-07-19)
+[Info]
+language=Russian
+date=2024-04-13 by TeraTerm Project
+contributor=Ryumik Sergey (2017-07-19)
 
 [Tera Term]
 DLG_SYSTEM_FONT=System,14,0
@@ -59,7 +61,7 @@ MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=&Клавиатура...
 MENU_SETUP_SERIALPORT=&COM-порт...
 MENU_SETUP_TCPIP=T&CP/IP...
-MENU_SETUP_GENERAL=&Общие...
+MENU_SETUP_GENERAL=&Общие(LanguageUI)...
 MENU_SETUP_ADDITION=&Дополнительные настройки...
 MENU_SETUP_SAVE=&Сохранить настройки...
 MENU_SETUP_RESTORE=&Восстановить настройки...

diff --git a/installer/release/lang_utf8/Simplified Chinese.lng b/installer/release/lang_utf8/Simplified Chinese.lng
@@ -1,5 +1,7 @@
-; Updated by TeraTerm Project (2024-03-30)
-; Last translated (Simplified Chinese language) by LiShaohui (2017-04-11)
+[Info]
+language=Simplified Chinese
+date=2024-04-13 by TeraTerm Project
+contributor=LiShaohui (2017-04-11)
 
 [Tera Term]
 DLG_SYSTEM_FONT=微软雅黑,10,0
@@ -59,7 +61,7 @@ MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=键盘(&K)...
 MENU_SETUP_SERIALPORT=串口(&E)...
 MENU_SETUP_TCPIP=T&CP/IP...
-MENU_SETUP_GENERAL=常规(&G)...
+MENU_SETUP_GENERAL=常规(LanguageUI)(&G)...
 MENU_SETUP_ADDITION=附加设置(&D)...
 MENU_SETUP_SAVE=保存配置(&S)...
 MENU_SETUP_RESTORE=载入配置(&R)...

diff --git a/installer/release/lang_utf8/Spanish.lng b/installer/release/lang_utf8/Spanish.lng
@@ -1,5 +1,7 @@
-; Updated by TeraTerm Project (2024-03-30)
-; Traducido por Filiberto Olguin Ascona.
+[Info]
+language=Spanish
+date=2024-04-13 by TeraTerm Project
+contributor=Filiberto Olguin Ascona (2022-05-26)
 
 [Tera Term]
 DLG_SYSTEM_FONT=System,14,0
@@ -59,7 +61,7 @@ MENU_SETUP_DIALOG_FONT=&Dialog fuente...
 MENU_SETUP_KEYBOARD=&Teclado...
 MENU_SETUP_SERIALPORT=Puerto S&erial...
 MENU_SETUP_TCPIP=T&CP/IP...
-MENU_SETUP_GENERAL=&General...
+MENU_SETUP_GENERAL=&General(LanguageUI)...
 MENU_SETUP_ADDITION=Configuracion a&dicional...
 MENU_SETUP_SAVE=&Guardar Configuracion...
 MENU_SETUP_RESTORE=&Restaurar Configuracion...

diff --git a/installer/release/lang_utf8/Tamil.lng b/installer/release/lang_utf8/Tamil.lng
@@ -1,5 +1,7 @@
-; Updated by TeraTerm Project (2024-03-30)
-; Last translated (Tamil language) by திட்டத்தால் புதுப்பிக்கப்பட்டது (2024-02-24)
+[Info]
+language=Tamil(தமிழ்)
+date=2024-04-13 by TeraTerm Project
+contributor=திட்டத்தால் புதுப்பிக்கப்பட்டது (2024-02-24)
 
 [Tera Term]
 DLG_SYSTEM_FONT=System,14,0
@@ -59,7 +61,7 @@ MENU_SETUP_DIALOG_FONT=&உரையாடல் எழுத்துரு...
 MENU_SETUP_KEYBOARD=&விசைப்பலகை...
 MENU_SETUP_SERIALPORT=தொடர் துறைமுகம்...
 MENU_SETUP_TCPIP=பகநெ/இநெ...
-MENU_SETUP_GENERAL=&பொது...
+MENU_SETUP_GENERAL=&பொது(LanguageUI)...
 MENU_SETUP_ADDITION=கூடுதல் அமைப்புகள்...
 MENU_SETUP_SAVE=&அமைப்பைச் சேமி...
 MENU_SETUP_RESTORE=&அமைவை மீட்டமை...

diff --git a/installer/release/lang_utf8/Traditional Chinese.lng b/installer/release/lang_utf8/Traditional Chinese.lng
@@ -1,5 +1,7 @@
-; Updated by TeraTerm Project (2024-03-30)
-; Last translated (Traditional Chinese language) by kikiqqp (2014-09-20)
+[Info]
+language=Traditional Chinese
+date=2024-04-13 by TeraTerm Project
+contributor=kikiqqp (2014-09-20)
 
 [Tera Term]
 DLG_SYSTEM_FONT=新細明體,10,0
@@ -59,7 +61,7 @@ MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=鍵盤(&K)...
 MENU_SETUP_SERIALPORT=連接埠(&E)...
 MENU_SETUP_TCPIP=T&CP/IP...
-MENU_SETUP_GENERAL=設定(&G)...
+MENU_SETUP_GENERAL=設定(LanguageUI)(&G)...
 MENU_SETUP_ADDITION=附加設定(&D)...
 MENU_SETUP_SAVE=儲存設定(&S)...
 MENU_SETUP_RESTORE=載入設定(&R)...

diff --git a/teraterm/ttpdlg/dlg_res.h b/teraterm/ttpdlg/dlg_res.h
@@ -1,8 +1,7 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by ttpdlg.rc
+// Microsoft Visual C++ で生成されたインクルード ファイル。
+// ttpdlg.rc で使用
 //
-#define IDD_TERMDLGJ                    100
 #define IDI_TTERM                       100
 #define IDC_TERMWIDTH                   101
 #define IDC_SERIALPORT_LABEL            101
@@ -162,25 +161,25 @@
 #define IDC_GENLANG_UI                  1077
 #define IDC_SFMT_VERSION                1078
 #define IDC_SERIALTEXT                  1079
+#define IDC_GENLANUI_INFO               1080
 #define IDC_GENHELP                     1099
 #define IDD_TERMDLG                     1100
 #define IDD_WINLISTDLG                  1200
 #define IDC_WINLISTLIST                 1201
 #define IDC_WINLISTCLOSE                1202
 #define IDC_WINLISTHELP                 1299
-#define IDD_TERMDLGK                    1301
 #define IDC_STATIC                      -1
 #define IDC_GENLANUI_LABEL              -1
 #define IDC_GENLANGUI_LABEL             -1
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        103
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1080
+#define _APS_NEXT_CONTROL_VALUE         1081
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
-Original file line number
+Diff line change
@@ Expand Up @@
             </ul>
           </li>
           <li>Default port settings is moved to <a href="../menu/setup-additional.html#Port">General tab</a> of Additional settings dialog.</li>
+          <li>Display lng file information when <a href="../menu/setup-general.html#UILanguageFile">LanguageUI</a> is selected. Remove language setting.</li>
         </ul>
       </li>
@@ Expand Down @@