Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [INPUT] Implement advanced settings (#5864)
by Katayama Hirofumi MZ 19 Nov '23

19 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80c4856bbafd9286a5f4d… commit 80c4856bbafd9286a5f4de243c05bb01806953a0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 21:39:06 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 19 21:39:06 2023 +0900 [INPUT] Implement advanced settings (#5864) Allow the user to turn off "Advanced Text Service". [HKEY_CURRENT_USER\Software\Microsoft\CTF] "Disable Thread Input Manager"=dword:00000001 Implement AdvancedSettingsPageProc procedure. Modify IDS_REBOOT_NOW resource string. CORE-19268 --- dll/cpl/input/advanced_settings_page.c | 92 +++++++++++++++++++++++++++++++++- dll/cpl/input/input.c | 32 ++++++++++-- dll/cpl/input/input.h | 2 + dll/cpl/input/input_list.c | 16 ++++++ dll/cpl/input/lang/bg-BG.rc | 2 +- dll/cpl/input/lang/cs-CZ.rc | 2 +- dll/cpl/input/lang/de-DE.rc | 2 +- dll/cpl/input/lang/el-GR.rc | 2 +- dll/cpl/input/lang/en-US.rc | 2 +- dll/cpl/input/lang/es-ES.rc | 2 +- dll/cpl/input/lang/fr-FR.rc | 2 +- dll/cpl/input/lang/he-IL.rc | 2 +- dll/cpl/input/lang/id-ID.rc | 2 +- dll/cpl/input/lang/it-IT.rc | 2 +- dll/cpl/input/lang/ja-JP.rc | 2 +- dll/cpl/input/lang/no-NO.rc | 2 +- dll/cpl/input/lang/pl-PL.rc | 2 +- dll/cpl/input/lang/pt-BR.rc | 2 +- dll/cpl/input/lang/pt-PT.rc | 2 +- dll/cpl/input/lang/ro-RO.rc | 2 +- dll/cpl/input/lang/ru-RU.rc | 2 +- dll/cpl/input/lang/sk-SK.rc | 2 +- dll/cpl/input/lang/sq-AL.rc | 2 +- dll/cpl/input/lang/tr-TR.rc | 2 +- dll/cpl/input/lang/uk-UA.rc | 2 +- dll/cpl/input/lang/zh-CN.rc | 2 +- dll/cpl/input/lang/zh-HK.rc | 2 +- dll/cpl/input/lang/zh-TW.rc | 2 +- dll/cpl/input/settings_page.c | 42 ++-------------- 29 files changed, 166 insertions(+), 66 deletions(-) diff --git a/dll/cpl/input/advanced_settings_page.c b/dll/cpl/input/advanced_settings_page.c index 77536525a34..45e32591095 100644 --- a/dll/cpl/input/advanced_settings_page.c +++ b/dll/cpl/input/advanced_settings_page.c @@ -3,13 +3,103 @@ * FILE: dll/cpl/input/advanced_settings_page.c * PURPOSE: input.dll * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) +* Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "input.h" +BOOL g_bTextServiceIsOff = FALSE; + +BOOL LoadAdvancedSettings(HWND hwndDlg) +{ + HKEY hKey; + LRESULT error; + DWORD dwType; + DWORD dwValue; + DWORD cbValue = sizeof(dwValue); + + error = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\CTF", 0, KEY_READ, &hKey); + if (error != ERROR_SUCCESS) + return FALSE; + + error = RegQueryValueExW(hKey, + L"Disable Thread Input Manager", + NULL, + &dwType, + (LPBYTE)&dwValue, + &cbValue); + if ((error != ERROR_SUCCESS) || (dwType != REG_DWORD) || (cbValue != sizeof(dwValue))) + dwValue = FALSE; /* Default */ + + RegCloseKey(hKey); + + CheckDlgButton(hwndDlg, IDC_TURNOFFTEXTSVCS_CB, (dwValue ? BST_CHECKED : BST_UNCHECKED)); + g_bTextServiceIsOff = !!dwValue; + return TRUE; +} + +BOOL SaveAdvancedSettings(HWND hwndDlg) +{ + HKEY hKey; + LRESULT error; + const DWORD dwValue = g_bTextServiceIsOff; + const DWORD cbValue = sizeof(dwValue); + + error = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\CTF", 0, KEY_WRITE, &hKey); + if (error != ERROR_SUCCESS) + return FALSE; + + error = RegSetValueExW(hKey, L"Disable Thread Input Manager", 0, REG_DWORD, + (const BYTE *)&dwValue, cbValue); + + RegCloseKey(hKey); + return (error == ERROR_SUCCESS); +} + +static INT_PTR OnNotifyAdvancedSettingsPage(HWND hwndDlg, LPARAM lParam) +{ + LPNMHDR header = (LPNMHDR)lParam; + + switch (header->code) + { + case PSN_APPLY: + { + BOOL bOff = (IsDlgButtonChecked(hwndDlg, IDC_TURNOFFTEXTSVCS_CB) == BST_CHECKED); + g_bRebootNeeded |= (g_bTextServiceIsOff && !bOff); + g_bTextServiceIsOff = bOff; + + /* Write advanced settings */ + SaveAdvancedSettings(hwndDlg); + break; + } + } + + return 0; +} INT_PTR CALLBACK AdvancedSettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return FALSE; + switch (uMsg) + { + case WM_INITDIALOG: + LoadAdvancedSettings(hwndDlg); + return TRUE; + + case WM_NOTIFY: + return OnNotifyAdvancedSettingsPage(hwndDlg, lParam); + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_TURNOFFTEXTSVCS_CB: + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + break; + } + } + + return 0; } diff --git a/dll/cpl/input/input.c b/dll/cpl/input/input.c index cd8a0291cb5..de64edf9af7 100644 --- a/dll/cpl/input/input.c +++ b/dll/cpl/input/input.c @@ -15,6 +15,7 @@ static LONG CALLBACK SystemApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2); HINSTANCE hApplet = NULL; +BOOL g_bRebootNeeded = FALSE; /* Applets */ static APPLET Applets[NUM_APPLETS] = @@ -35,19 +36,44 @@ InitPropSheetPage(PROPSHEETPAGEW *page, WORD idDlg, DLGPROC DlgProc) page->pfnDlgProc = DlgProc; } +static BOOL AskForReboot(HWND hwndDlg) +{ + WCHAR szText[128], szCaption[64]; + LoadStringW(hApplet, IDS_REBOOT_NOW, szText, _countof(szText)); + LoadStringW(hApplet, IDS_LANGUAGE, szCaption, _countof(szCaption)); + return (MessageBoxW(hwndDlg, szText, szCaption, MB_ICONINFORMATION | MB_YESNO) == IDYES); +} + static int CALLBACK PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) { - // NOTE: This callback is needed to set large icon correctly. - HICON hIcon; switch (uMsg) { case PSCB_INITIALIZED: { - hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM)); + /* Set large icon correctly */ + HICON hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM)); SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); break; } + + case PSCB_BUTTONPRESSED: + { + switch (lParam) + { + case PSBTN_OK: + case PSBTN_APPLYNOW: + { + if (g_bRebootNeeded && AskForReboot(hwndDlg)) + { + EnableProcessPrivileges(SE_SHUTDOWN_NAME, TRUE); + ExitWindowsEx(EWX_REBOOT | EWX_FORCE, 0); + } + break; + } + } + break; + } } return 0; } diff --git a/dll/cpl/input/input.h b/dll/cpl/input/input.h index 4f06ea66ac6..b57993c0c2c 100644 --- a/dll/cpl/input/input.h +++ b/dll/cpl/input/input.h @@ -28,6 +28,7 @@ typedef struct } APPLET, *PAPPLET; extern HINSTANCE hApplet; +extern BOOL g_bRebootNeeded; // Character Count of a layout ID like "00000409" #define CCH_LAYOUT_ID 8 @@ -40,6 +41,7 @@ extern HINSTANCE hApplet; /* settings_page.c */ INT_PTR CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +BOOL EnableProcessPrivileges(LPCWSTR lpPrivilegeName, BOOL bEnable); /* advanced_settings_page.c */ INT_PTR CALLBACK diff --git a/dll/cpl/input/input_list.c b/dll/cpl/input/input_list.c index 49347d841dc..8cb6b443cca 100644 --- a/dll/cpl/input/input_list.c +++ b/dll/cpl/input/input_list.c @@ -395,12 +395,28 @@ InputList_Process(VOID) return FALSE; } + /* Find change in the IME HKLs */ + for (pCurrent = _InputList; pCurrent != NULL; pCurrent = pCurrent->pNext) + { + if (!IS_IME_HKL(pCurrent->hkl)) + continue; + + if ((pCurrent->wFlags & INPUT_LIST_NODE_FLAG_ADDED) || + (pCurrent->wFlags & INPUT_LIST_NODE_FLAG_EDITED) || + (pCurrent->wFlags & INPUT_LIST_NODE_FLAG_DELETED)) + { + bRet = TRUE; /* Reboot is needed */ + break; + } + } + /* Process DELETED and EDITED entries */ for (pCurrent = _InputList; pCurrent != NULL; pCurrent = pCurrent->pNext) { if ((pCurrent->wFlags & INPUT_LIST_NODE_FLAG_DELETED) || (pCurrent->wFlags & INPUT_LIST_NODE_FLAG_EDITED)) { + /* Only unload the DELETED and EDITED entries */ if (UnloadKeyboardLayout(pCurrent->hkl)) { diff --git a/dll/cpl/input/lang/bg-BG.rc b/dll/cpl/input/lang/bg-BG.rc index d7e7ff05828..fc6385936bc 100644 --- a/dll/cpl/input/lang/bg-BG.rc +++ b/dll/cpl/input/lang/bg-BG.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Ляв Alt+Shift" IDS_SWITCH_BET_INLANG "Превключване на езиците за въвеждане" - IDS_REBOOT_NOW, "Рестартирай сега?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/cs-CZ.rc b/dll/cpl/input/lang/cs-CZ.rc index 1b58469d1d1..ebea8f9fd25 100644 --- a/dll/cpl/input/lang/cs-CZ.rc +++ b/dll/cpl/input/lang/cs-CZ.rc @@ -115,7 +115,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Levý Alt+Shift" IDS_SWITCH_BET_INLANG "Přepnout mezi vstupními jazyky" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/de-DE.rc b/dll/cpl/input/lang/de-DE.rc index 38984e61436..4e55706aa26 100644 --- a/dll/cpl/input/lang/de-DE.rc +++ b/dll/cpl/input/lang/de-DE.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Strg+Umschalt" IDS_LEFT_ALT_SHIFT "Alt links+Umschalt" IDS_SWITCH_BET_INLANG "Zwischen Eingabesprachen umschalten" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/el-GR.rc b/dll/cpl/input/lang/el-GR.rc index fa982cd7b80..b5ca7be6454 100644 --- a/dll/cpl/input/lang/el-GR.rc +++ b/dll/cpl/input/lang/el-GR.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/en-US.rc b/dll/cpl/input/lang/en-US.rc index 9e8709b065f..8ba0158e9e8 100644 --- a/dll/cpl/input/lang/en-US.rc +++ b/dll/cpl/input/lang/en-US.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/es-ES.rc b/dll/cpl/input/lang/es-ES.rc index 9401b59f1d6..19acb40fccd 100644 --- a/dll/cpl/input/lang/es-ES.rc +++ b/dll/cpl/input/lang/es-ES.rc @@ -119,7 +119,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Mayús" IDS_LEFT_ALT_SHIFT "Alt Izq+Mayús" IDS_SWITCH_BET_INLANG "Cambiar entre los idiomas de entrada" - IDS_REBOOT_NOW, "¿Reiniciar ahora?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/fr-FR.rc b/dll/cpl/input/lang/fr-FR.rc index 24ab68dab44..1e45d284a9a 100644 --- a/dll/cpl/input/lang/fr-FR.rc +++ b/dll/cpl/input/lang/fr-FR.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Maj" IDS_LEFT_ALT_SHIFT "Alt Gauche+Maj" IDS_SWITCH_BET_INLANG "Changer les langues de saisie" - IDS_REBOOT_NOW, "Redémarrer maintenant ?" + IDS_REBOOT_NOW "Il est nécessaire de redémarrer le système afin que les changements prennent effet. Redémarrer maintenant ?" END /* FIXME : À améliorer/compléter */ diff --git a/dll/cpl/input/lang/he-IL.rc b/dll/cpl/input/lang/he-IL.rc index e6685eb3155..2a838ad2a4d 100644 --- a/dll/cpl/input/lang/he-IL.rc +++ b/dll/cpl/input/lang/he-IL.rc @@ -112,7 +112,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "מקש Alt שמאלי+Shift" IDS_SWITCH_BET_INLANG "החלף בין שפות כתיבה" - IDS_REBOOT_NOW, "להפעיל מחדש כעת?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/id-ID.rc b/dll/cpl/input/lang/id-ID.rc index 40667cfbc71..323dfa45224 100644 --- a/dll/cpl/input/lang/id-ID.rc +++ b/dll/cpl/input/lang/id-ID.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt kiri+Shift" IDS_SWITCH_BET_INLANG "Mengganti salah satu bahasa masukan" - IDS_REBOOT_NOW, "Mulai ulang sekarang?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/it-IT.rc b/dll/cpl/input/lang/it-IT.rc index 44acb4187b2..19b98363462 100644 --- a/dll/cpl/input/lang/it-IT.rc +++ b/dll/cpl/input/lang/it-IT.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt sinistro+Shift" IDS_SWITCH_BET_INLANG "Cambia lingua di digitazione" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/ja-JP.rc b/dll/cpl/input/lang/ja-JP.rc index a3fbc0b8925..ddbac542302 100644 --- a/dll/cpl/input/lang/ja-JP.rc +++ b/dll/cpl/input/lang/ja-JP.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左Alt+Shift" IDS_SWITCH_BET_INLANG "入力言語の切り替え" - IDS_REBOOT_NOW, "再起動しますか?" + IDS_REBOOT_NOW "設定を有効にするにはシステムを再起動する必要があります。今すぐ再起動しますか？" END STRINGTABLE diff --git a/dll/cpl/input/lang/no-NO.rc b/dll/cpl/input/lang/no-NO.rc index 2dd97cb0dcd..75a786126bc 100644 --- a/dll/cpl/input/lang/no-NO.rc +++ b/dll/cpl/input/lang/no-NO.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Venstre Alt+Shift" IDS_SWITCH_BET_INLANG "Bytt mellom inndataspråk" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/pl-PL.rc b/dll/cpl/input/lang/pl-PL.rc index 8643faabee5..80f6be90a27 100644 --- a/dll/cpl/input/lang/pl-PL.rc +++ b/dll/cpl/input/lang/pl-PL.rc @@ -119,7 +119,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Lewy Alt+Shift" IDS_SWITCH_BET_INLANG "Przełącza pomiędzy układami klawiatury" - IDS_REBOOT_NOW, "Uruchomić ponownie system?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/pt-BR.rc b/dll/cpl/input/lang/pt-BR.rc index 9dbee2c881a..a320f414a53 100644 --- a/dll/cpl/input/lang/pt-BR.rc +++ b/dll/cpl/input/lang/pt-BR.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "CTRL+SHIFT" IDS_LEFT_ALT_SHIFT "ALT esquerdo+SHIFT" IDS_SWITCH_BET_INLANG "Alternar entre idiomas de entrada" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/pt-PT.rc b/dll/cpl/input/lang/pt-PT.rc index b8d05992c31..7972707e353 100644 --- a/dll/cpl/input/lang/pt-PT.rc +++ b/dll/cpl/input/lang/pt-PT.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "CTRL+SHIFT" IDS_LEFT_ALT_SHIFT "ALT esquerdo+SHIFT" IDS_SWITCH_BET_INLANG "Alternar entre idiomas de entrada" - IDS_REBOOT_NOW, "Reiniciar agora?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/ro-RO.rc b/dll/cpl/input/lang/ro-RO.rc index e20715df5e9..00835477038 100644 --- a/dll/cpl/input/lang/ro-RO.rc +++ b/dll/cpl/input/lang/ro-RO.rc @@ -118,7 +118,7 @@ BEGIN IDS_CTRL_SHIFT "«Ctrl» + «Shift»" IDS_LEFT_ALT_SHIFT "«Alt» (stâng) + «Shift»" IDS_SWITCH_BET_INLANG "Comutarea între limbile de intrare" - IDS_REBOOT_NOW, "Reporniți acum?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/ru-RU.rc b/dll/cpl/input/lang/ru-RU.rc index ca1ddcccedd..838262e836c 100644 --- a/dll/cpl/input/lang/ru-RU.rc +++ b/dll/cpl/input/lang/ru-RU.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt слева+Shift" IDS_SWITCH_BET_INLANG "Переключение между языками ввода" - IDS_REBOOT_NOW, "Перезагрузить сейчас?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/sk-SK.rc b/dll/cpl/input/lang/sk-SK.rc index 89422607055..4cdaad5f0cc 100644 --- a/dll/cpl/input/lang/sk-SK.rc +++ b/dll/cpl/input/lang/sk-SK.rc @@ -115,7 +115,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Ľavý Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/sq-AL.rc b/dll/cpl/input/lang/sq-AL.rc index d8760da6718..b1026259e29 100644 --- a/dll/cpl/input/lang/sq-AL.rc +++ b/dll/cpl/input/lang/sq-AL.rc @@ -114,7 +114,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "Ndërro ndër gjuhët hyrese" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/tr-TR.rc b/dll/cpl/input/lang/tr-TR.rc index 02e3367a43b..9bc688f7e89 100644 --- a/dll/cpl/input/lang/tr-TR.rc +++ b/dll/cpl/input/lang/tr-TR.rc @@ -112,7 +112,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl + Shift" IDS_LEFT_ALT_SHIFT "Sol Alt + Shift" IDS_SWITCH_BET_INLANG "Giriş dilleri arasında geçiş yap." - IDS_REBOOT_NOW, "Şimdi yeniden başlatılsın mı?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/uk-UA.rc b/dll/cpl/input/lang/uk-UA.rc index 7e3be1e26c7..deb2fce89ce 100644 --- a/dll/cpl/input/lang/uk-UA.rc +++ b/dll/cpl/input/lang/uk-UA.rc @@ -118,7 +118,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt зліва+Shift" IDS_SWITCH_BET_INLANG "Перемикання мов вводу" - IDS_REBOOT_NOW, "Перезавантажити зараз?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/zh-CN.rc b/dll/cpl/input/lang/zh-CN.rc index 41053c006e6..d35e4903531 100644 --- a/dll/cpl/input/lang/zh-CN.rc +++ b/dll/cpl/input/lang/zh-CN.rc @@ -112,7 +112,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左 Alt+Shift" IDS_SWITCH_BET_INLANG "在输入语言间切换" - IDS_REBOOT_NOW, "要现在重新启动计算机吗？" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/zh-HK.rc b/dll/cpl/input/lang/zh-HK.rc index 355dd92d44e..cdbcbf1c6bc 100644 --- a/dll/cpl/input/lang/zh-HK.rc +++ b/dll/cpl/input/lang/zh-HK.rc @@ -118,7 +118,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左 Alt+Shift" IDS_SWITCH_BET_INLANG "在輸入語言間切換" - IDS_REBOOT_NOW, "要立即重新啟動嗎？" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/zh-TW.rc b/dll/cpl/input/lang/zh-TW.rc index e535fd54902..edfae5f8edc 100644 --- a/dll/cpl/input/lang/zh-TW.rc +++ b/dll/cpl/input/lang/zh-TW.rc @@ -118,7 +118,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左 Alt+Shift" IDS_SWITCH_BET_INLANG "在輸入語言間切換" - IDS_REBOOT_NOW, "要立即重新啟動嗎？" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/settings_page.c b/dll/cpl/input/settings_page.c index bf10b057623..7f5057cddad 100644 --- a/dll/cpl/input/settings_page.c +++ b/dll/cpl/input/settings_page.c @@ -15,7 +15,6 @@ static INT s_nAliveLeafCount = 0; static INT s_nRootCount = 0; static INT s_iKeyboardImage = -1; static INT s_iDotImage = -1; -static BOOL s_bDefaultInputChanged = FALSE; static HICON CreateLayoutIcon(LANGID LangID) @@ -461,12 +460,12 @@ OnCommandSettingsPage(HWND hwndDlg, WPARAM wParam) if (HIWORD(item.lParam)) // Leaf? { if (InputList_Remove((INPUT_LIST_NODE*)item.lParam)) - s_bDefaultInputChanged = TRUE; + g_bRebootNeeded = TRUE; } else // Root? { if (InputList_RemoveByLang(LOWORD(item.lParam))) - s_bDefaultInputChanged = TRUE; + g_bRebootNeeded = TRUE; } UpdateInputListView(hwndList); @@ -533,7 +532,7 @@ OnCommandSettingsPage(HWND hwndDlg, WPARAM wParam) INPUT_LIST_NODE* pNode = (INPUT_LIST_NODE*)lParam; if (!(pNode->wFlags & INPUT_LIST_NODE_FLAG_DEFAULT)) { - s_bDefaultInputChanged = TRUE; + g_bRebootNeeded = TRUE; InputList_SetDefault(pNode); UpdateInputListView(hwndList); SetControlsState(hwndDlg); @@ -546,24 +545,6 @@ OnCommandSettingsPage(HWND hwndDlg, WPARAM wParam) } } -static BOOL IsRebootNeeded(VOID) -{ - INPUT_LIST_NODE *pNode; - - if (s_bDefaultInputChanged) - return TRUE; - - for (pNode = InputList_GetFirst(); pNode != NULL; pNode = pNode->pNext) - { - if (IS_IME_HKL(pNode->hkl)) /* IME? */ - { - return TRUE; - } - } - - return FALSE; -} - BOOL EnableProcessPrivileges(LPCWSTR lpPrivilegeName, BOOL bEnable) { HANDLE hToken; @@ -619,23 +600,8 @@ OnNotifySettingsPage(HWND hwndDlg, LPARAM lParam) case PSN_APPLY: { - BOOL bRebootNeeded = IsRebootNeeded(); - /* Write Input Methods list to registry */ - if (InputList_Process() && bRebootNeeded) - { - /* Needs reboot */ - WCHAR szNeedsReboot[128], szLanguage[64]; - LoadStringW(hApplet, IDS_REBOOT_NOW, szNeedsReboot, _countof(szNeedsReboot)); - LoadStringW(hApplet, IDS_LANGUAGE, szLanguage, _countof(szLanguage)); - - if (MessageBoxW(hwndDlg, szNeedsReboot, szLanguage, - MB_ICONINFORMATION | MB_YESNOCANCEL) == IDYES) - { - EnableProcessPrivileges(SE_SHUTDOWN_NAME, TRUE); - ExitWindowsEx(EWX_REBOOT | EWX_FORCE, 0); - } - } + g_bRebootNeeded |= InputList_Process(); break; } }

1 0

[reactos] 01/01: [STOBJECT] Remove #if 0 and #endif in Volume_IsMute (#5973)
by Katayama Hirofumi MZ 19 Nov '23

19 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6a0ef10d205f846a5204… commit b6a0ef10d205f846a5204e21b0db3e9a406bfc5c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 21:28:37 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 19 21:28:37 2023 +0900 [STOBJECT] Remove #if 0 and #endif in Volume_IsMute (#5973) Based on KRosUser's volume.patch. The pair of #if 0 and #endif was added in 180b6fb. CORE-18583 --- dll/shellext/stobject/volume.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dll/shellext/stobject/volume.cpp b/dll/shellext/stobject/volume.cpp index 4b63e05a6b1..048197eaab1 100644 --- a/dll/shellext/stobject/volume.cpp +++ b/dll/shellext/stobject/volume.cpp @@ -111,7 +111,6 @@ static HRESULT __stdcall Volume_FindMixerControl(CSysTray * pSysTray) HRESULT Volume_IsMute() { -#if 0 MIXERCONTROLDETAILS mixerControlDetails; if (g_mixerId != (UINT)-1 && g_muteControlID != (DWORD)-1) @@ -123,14 +122,14 @@ HRESULT Volume_IsMute() mixerControlDetails.cChannels = 1; mixerControlDetails.paDetails = &detailsResult; mixerControlDetails.cbDetails = sizeof(detailsResult); - if (mixerGetControlDetailsW((HMIXEROBJ) g_mixerId, &mixerControlDetails, 0)) + if (mixerGetControlDetailsW((HMIXEROBJ)UlongToHandle(g_mixerId), &mixerControlDetails, 0)) return E_FAIL; TRACE("Obtained mute status %d\n", detailsResult); g_IsMute = detailsResult != 0; } -#endif + return S_OK; }

1 0

[reactos] 01/01: [HOTPLUG] Update Japanese (ja-JP) translation
by Katayama Hirofumi MZ 19 Nov '23

19 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5cfd837891ec004c956b… commit d5cfd837891ec004c956b22d377d73b6655b332d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:51:59 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:51:59 2023 +0900 [HOTPLUG] Update Japanese (ja-JP) translation CORE-18706 --- dll/cpl/hotplug/lang/ja-JP.rc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/cpl/hotplug/lang/ja-JP.rc b/dll/cpl/hotplug/lang/ja-JP.rc index 0940057bd35..9a544ce8ddd 100644 --- a/dll/cpl/hotplug/lang/ja-JP.rc +++ b/dll/cpl/hotplug/lang/ja-JP.rc @@ -18,15 +18,15 @@ BEGIN END IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 -CAPTION "Stop a Hardware Device" +CAPTION "ハードウェアデバイスを停止する" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" +FONT 9, "MS UI Gothic" BEGIN - LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "停止対象のデバイスを確認し、OK をクリックして下さい。", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS は、以下のデバイスを停止しようとしています。停止後は、安全に取り外すことができます。", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 198, 127, 50, 14 END @@ -48,6 +48,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "安全なハードウェアの取り外し" IDS_CPLDESCRIPTION "コンピュータからデバイスを安全に取り外しできます。" - IDS_UNKNOWN_DEVICE "Unknown Device" - IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" + IDS_UNKNOWN_DEVICE "未知のデバイス" + IDS_EJECT_ERROR_FORMAT "デバイス (0x%x) の取り外しに失敗\0" END

1 0

[reactos] 01/01: [DEVCPUX] Add Japanese (ja-JP) translation
by Katayama Hirofumi MZ 19 Nov '23

19 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a63d4a3c1f8992e0d9d1… commit 6a63d4a3c1f8992e0d9d1c5524f2d715b6fcff5f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:44:25 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:44:25 2023 +0900 [DEVCPUX] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/devcpux/lang/ja-JP.rc | 41 ++++++++++++++++++++++++++++++++++++++ dll/shellext/devcpux/processor.rc | 3 +++ 2 files changed, 44 insertions(+) diff --git a/dll/shellext/devcpux/lang/ja-JP.rc b/dll/shellext/devcpux/lang/ja-JP.rc new file mode 100644 index 00000000000..6d2a1968f4b --- /dev/null +++ b/dll/shellext/devcpux/lang/ja-JP.rc @@ -0,0 +1,41 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "CPU" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "機能:", -1, 7, 23, 50, 8 + LTEXT "テスト", IDC_FEATURES, 57, 23, 181, 8 + LTEXT "モデル:", -1, 7, 38, 50, 8 + LTEXT "テスト", IDC_MODEL, 57, 38, 181, 8 + LTEXT "ステッピング:", -1, 7, 53, 50, 51 + LTEXT "テスト", IDC_STEPPING, 57, 53, 181, 8 + LTEXT "コア速度:", -1, 7, 68, 50, 8 + LTEXT "テスト", IDC_CORESPEED, 57, 68, 181, 8 +END + +STRINGTABLE +BEGIN + IDS_MEGAHERTZ "%ld MHz" +END + +/* +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "CPU" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "機能:", -1, 7, 23, 50, 8 + LTEXT "<テスト>", IDC_FEATURES, 7, 34, 238, 8 + + LTEXT "モデル:", -1, 7, 49, 50, 8 + LTEXT "<テスト>", IDC_MODEL, 7, 60, 238, 8 + + LTEXT "ステッピング:", -1, 7, 75, 50, 8 + LTEXT "<テスト>", IDC_STEPPING, 7, 86, 238, 8 + + LTEXT "コア速度:", -1, 7, 101, 50, 8 + LTEXT "<テスト>", IDC_CORESPEED, 7, 112, 238, 8 +END +*/ \ No newline at end of file diff --git a/dll/shellext/devcpux/processor.rc b/dll/shellext/devcpux/processor.rc index 83a55e66831..46f24a65c57 100644 --- a/dll/shellext/devcpux/processor.rc +++ b/dll/shellext/devcpux/processor.rc @@ -24,6 +24,9 @@ #ifdef LANGUAGE_HI_IN #include "lang/hi-IN.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 0

[reactos] 01/01: [DESKADP] Add Japanese (ja-JP) translation
by Katayama Hirofumi MZ 19 Nov '23

19 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2988b537a1e40648272d… commit e2988b537a1e40648272d4ed874d985b1f5d064b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:39:30 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:39:30 2023 +0900 [DESKADP] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/deskadp/deskadp.rc | 3 +++ dll/shellext/deskadp/lang/ja-JP.rc | 49 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/dll/shellext/deskadp/deskadp.rc b/dll/shellext/deskadp/deskadp.rc index bf4c1da4601..db8d6373fd3 100644 --- a/dll/shellext/deskadp/deskadp.rc +++ b/dll/shellext/deskadp/deskadp.rc @@ -49,6 +49,9 @@ IDC_DESK_ADAPTER ICON "resources/adapter.ico" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif diff --git a/dll/shellext/deskadp/lang/ja-JP.rc b/dll/shellext/deskadp/lang/ja-JP.rc new file mode 100644 index 00000000000..8f18a06385f --- /dev/null +++ b/dll/shellext/deskadp/lang/ja-JP.rc @@ -0,0 +1,49 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "アダプター" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + GROUPBOX "アダプターの種類", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "プロパティ(&P)", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "アダプター情報", -1, 7, 56, 237, 75 + LTEXT "チップの種類:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 77, 68, 164, 8, SS_NOPREFIX + LTEXT "DAC の種類:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 77, 80, 164, 8, SS_NOPREFIX + LTEXT "メモリーサイズ:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 77, 92, 164, 8, SS_NOPREFIX + LTEXT "アダプター文字列:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 77, 104, 164, 8, SS_NOPREFIX + LTEXT "BIOS 情報:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 77, 116, 164, 8, SS_NOPREFIX + PUSHBUTTON "すべてのモードのリスト(&L)...", IDC_LISTALLMODES, 7, 139, 75, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "すべてのモードのリスト" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 + PUSHBUTTON "キャンセル", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "有効なモードのリスト", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d by %d, %s, %s" + IDS_DEFREFRESHRATE "既定のリフレッシュ" + IDES_REFRESHRATEFMT "%d ヘルツ" + IDS_4BPP "16 色" + IDS_8BPP "256 色" + IDS_15BPP "High Color (15 ビット)" + IDS_16BPP "High Color (16 ビット)" + IDS_24BPP "True Color (24 ビット)" + IDS_32BPP "True Color (32 ビット)" + IDS_NOTAVAIL "利用不可" +END

1 0

[reactos] 01/01: [CRYPTEXT] Add Japanese (ja-JP) translation
by Katayama Hirofumi MZ 19 Nov '23

19 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4aeaf747d166949471700… commit 4aeaf747d1669494717006021b1800138db0c2e7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:34:39 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:34:39 2023 +0900 [CRYPTEXT] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/cryptext/cryptext.rc | 3 +++ dll/shellext/cryptext/lang/ja-JP.rc | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dll/shellext/cryptext/cryptext.rc b/dll/shellext/cryptext/cryptext.rc index 9e2e70070da..ffc3a5df7e9 100644 --- a/dll/shellext/cryptext/cryptext.rc +++ b/dll/shellext/cryptext/cryptext.rc @@ -32,6 +32,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/dll/shellext/cryptext/lang/ja-JP.rc b/dll/shellext/cryptext/lang/ja-JP.rc new file mode 100644 index 00000000000..3ee027c3726 --- /dev/null +++ b/dll/shellext/cryptext/lang/ja-JP.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_INVALIDFILE "これは有効な証明書ファイルではありません。" + IDS_CER_FILE "証明書ファイル" +END

1 0

[reactos] 01/01: [ACPPAGE] Add Japanese (ja-JP) translation
by Katayama Hirofumi MZ 19 Nov '23

19 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef754b121a613fd2a90e3… commit ef754b121a613fd2a90e307f2dac011a82e2a401 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:29:56 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:29:56 2023 +0900 [ACPPAGE] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/acppage/ACPPage.rc | 3 +++ dll/shellext/acppage/lang/ja-JP.rc | 42 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/dll/shellext/acppage/ACPPage.rc b/dll/shellext/acppage/ACPPage.rc index e031abe7fb2..ca472c50f13 100644 --- a/dll/shellext/acppage/ACPPage.rc +++ b/dll/shellext/acppage/ACPPage.rc @@ -52,6 +52,9 @@ IDR_ACPPAGE REGISTRY "res/acppage.rgs" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NL_NL #include "lang/nl-NL.rc" #endif diff --git a/dll/shellext/acppage/lang/ja-JP.rc b/dll/shellext/acppage/lang/ja-JP.rc new file mode 100644 index 00000000000..e5e3e2d7d69 --- /dev/null +++ b/dll/shellext/acppage/lang/ja-JP.rc @@ -0,0 +1,42 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_ACPPAGESHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "互換性" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "もしReactOSでプログラムを実行中に問題があれば、そのアプリに報告すべきOSを選択して下さい。\n注意: これは試験的な機能です。", IDC_EXPLANATION, 7, 7, 210, 31 + GROUPBOX "互換性モード", IDC_COMPATGROUP, 7, 41, 210, 49 + CHECKBOX "このプログラムを次の設定の互換性モードで実行:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "画面設定", -1, 7, 99, 210, 61, BS_GROUPBOX + CHECKBOX "256色で実行", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "画面を解像度 640x480 にする", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "視覚的テーマを無効化", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + PUSHBUTTON "互換性モードを編集(&D)...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 + LTEXT "",IDC_ENABLED_LAYERS,7,185,210,21 + CONTROL "<A>プログラム互換性</A>の詳細を知る", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "互換性モードの編集" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "キャンセル(&C)",IDCANCEL,240,114,60,14 + LTEXT "利用可能なモード",-1,6,6,52,8 + LTEXT "選択中のモード",-1,168,6,51,8 +END + +STRINGTABLE +BEGIN + IDS_COMPAT_TITLE "互換性" + IDS_FAILED_NETWORK "このプログラムはネットワークドライブにあるので互換性モードは設定できません。" + IDS_FAILED_PROTECTED "このプログラムは ReactOS の一部なので互換性モードは設定できません。" +END

1 0

[reactos] 01/01: [DESKMON] Add Japanese (ja-JP) translation
by Katayama Hirofumi MZ 19 Nov '23

19 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69d7adbebc91948e333ce… commit 69d7adbebc91948e333ce8d0e63008a3e0757c86 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:17:25 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:17:25 2023 +0900 [DESKMON] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/deskmon/deskmon.rc | 3 +++ dll/shellext/deskmon/lang/ja-JP.rc | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dll/shellext/deskmon/deskmon.rc b/dll/shellext/deskmon/deskmon.rc index 5cfc8a699ad..6e18edfa6f4 100644 --- a/dll/shellext/deskmon/deskmon.rc +++ b/dll/shellext/deskmon/deskmon.rc @@ -52,6 +52,9 @@ IDC_MONITORICO ICON "resources/monitor.ico" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif diff --git a/dll/shellext/deskmon/lang/ja-JP.rc b/dll/shellext/deskmon/lang/ja-JP.rc new file mode 100644 index 00000000000..680dbe0504c --- /dev/null +++ b/dll/shellext/deskmon/lang/ja-JP.rc @@ -0,0 +1,23 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "モニター" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "モニターの種類", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL + PUSHBUTTON "プロパティ(&P)", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "モニター設定", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "画面のリフレッシュレート(&S9:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "このモニターが表示できないモードを隠す(&H)", IDC_PRUNINGCHECK, 13, 106, 225, 10 +END + +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "ハードウェアの既定の設定を使う" + IDS_FREQFMT "%u ヘルツ" +END

1 0

[reactos] 01/01: [NETPLWIZ] Add Japanese (ja-JP) translation
by Katayama Hirofumi MZ 19 Nov '23

19 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da18e2893b068018770a7… commit da18e2893b068018770a7f670a5f4aedcc150067 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:12:17 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:12:17 2023 +0900 [NETPLWIZ] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/netplwiz/lang/ja-JP.rc | 21 +++++++++++++++++++++ dll/shellext/netplwiz/netplwiz.rc | 3 +++ 2 files changed, 24 insertions(+) diff --git a/dll/shellext/netplwiz/lang/ja-JP.rc b/dll/shellext/netplwiz/lang/ja-JP.rc new file mode 100644 index 00000000000..71913bb9a04 --- /dev/null +++ b/dll/shellext/netplwiz/lang/ja-JP.rc @@ -0,0 +1,21 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_DISCONNECTDRIVES DIALOGEX 0, 0, 300, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ネットワークドライブの接続を切る" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "接続を切りたいネットワークドライブを選択して OK をクリックして下さい。", -1, 7, 7, 286, 8 + LTEXT "ネットワークドライブ (&N):", -1, 7, 23, 286, 8 + CONTROL "", IDC_CONNECTEDDRIVELIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_SINGLESEL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 7, 31, 286, 140 + PUSHBUTTON "OK", ID_OK, 189, 179, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 243, 179, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_DIALOG_CAPTION "ネットワークドライブの接続を切る" + IDS_DRIVE_LETTER "ドライブ文字" + IDS_NETWORK_PATH "ネットワークパス" + IDS_NO_DRIVES "接続を切るネットワークドライブがありません。" +END diff --git a/dll/shellext/netplwiz/netplwiz.rc b/dll/shellext/netplwiz/netplwiz.rc index 3d843f11bf3..378a3e838ed 100644 --- a/dll/shellext/netplwiz/netplwiz.rc +++ b/dll/shellext/netplwiz/netplwiz.rc @@ -33,6 +33,9 @@ IDI_DISCONNECT_NET_DRIVES ICON "res/4400.ico" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 0

[reactos] 01/01: [STOBJECT] Add Japanese (ja-JP) translation
by Katayama Hirofumi MZ 19 Nov '23

19 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c9295fbeebd1a848f75f4… commit c9295fbeebd1a848f75f416ad6b54fcb93032462 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:06:50 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:06:50 2023 +0900 [STOBJECT] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/stobject/lang/ja-JP.rc | 51 +++++++++++++++++++++++++++++++++++++ dll/shellext/stobject/stobject.rc | 3 +++ 2 files changed, 54 insertions(+) diff --git a/dll/shellext/stobject/lang/ja-JP.rc b/dll/shellext/stobject/lang/ja-JP.rc new file mode 100644 index 00000000000..c775f35b425 --- /dev/null +++ b/dll/shellext/stobject/lang/ja-JP.rc @@ -0,0 +1,51 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_POWER_METER DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "電源メーター" +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "電源の状態", 1001, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 9, 20, 234, 189 + CONTROL "常にタスクバーにアイコンを表示する(&A)", 1002, "Button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 120, 10 + CONTROL "各バッテリーの詳細を表示する(&B)", 1003, "Button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 + CONTROL "", 1000, "Static", SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 +END + +STRINGTABLE +BEGIN + //Power related strings + IDS_PWR_PROPERTIES "電源のプロパティを調整(&A)" + IDS_PWR_METER "電源メーターを開く(&O)" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" + IDS_PWR_PERCENT_REMAINING "残り %u%%" + IDS_PWR_CHARGING "充電中 (%u%%)" + IDS_PWR_UNKNOWN_REMAINING "不明" + IDS_PWR_AC "交流電源" + IDS_PWR_HOURS_REMAINING "残り %1!u!:%2!02u! 時間 (%3!u!%%)" + IDS_PWR_MINUTES_REMAINING "残り %1!u! 分 (%2!u!%%)" + + //Hotplug related strings + IDS_HOTPLUG_REMOVE_1 "安全なハードウェアの取り外し" + IDS_HOTPLUG_REMOVE_2 "安全にハードウェアを取り除く(&S)" + IDS_HOTPLUG_REMOVE_3 "安全に %s を取り外す" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" + IDS_HOTPLUG_COMMA ", " + IDS_HOTPLUG_DRIVE " - ドライブ(%s)" + IDS_HOTPLUG_DRIVES " - ドライブ(%s)" + IDS_HOTPLUG_A "A:" + IDS_HOTPLUG_REQUIRES "このハードウェアは ""安全な取り外し"" が必要です" + IDS_HOTPLUG_CLICK "ハードウェアを取り除く前に、取り除くハードウェアを選択して、このアイコンをクリックして下さい。" + + //Volume related strings + IDS_VOL_VOLUME "音量" + IDS_VOL_ADJUST "音声プロパティを調整(&A)" + IDS_VOL_OPEN "音量調整を開く(&O)" + IDS_VOL_RUN "SNDVOL32.EXE" + IDS_VOL_MUTED "音量 (ミュート中)" + + //Keyboard-Mouse related strings + IDS_KEYS_STICKY "スティッキーキー" + IDS_KEYS_MOUSE "マウスキー" + IDS_KEYS_FILTER "フィルタキー" +END diff --git a/dll/shellext/stobject/stobject.rc b/dll/shellext/stobject/stobject.rc index bf310d7b95d..26610fe8b2d 100644 --- a/dll/shellext/stobject/stobject.rc +++ b/dll/shellext/stobject/stobject.rc @@ -71,6 +71,9 @@ IDR_SYSTRAY REGISTRY "resources/rgs/systray.rgs" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs