Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [THEMES] New restore window button for Lautus and Mizu themes (#4590)
by Thamatip Chitpong 16 Aug '22

16 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bd822366cae91975cd86… commit 3bd822366cae91975cd863696054dc189e3c26dd Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Tue Aug 16 21:40:16 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 16 17:40:16 2022 +0300 [THEMES] New restore window button for Lautus and Mizu themes (#4590) The original file for Lautus theme is made by JIRA user name Start. CORE-15101 CORE-15936 --- .../lautus.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp | Bin 3510 -> 3510 bytes .../mizu.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp | Bin 7350 -> 7350 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp index c637ec926a6..e6713e7573c 100644 Binary files a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp and b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp index f1e877335d9..cefffdfe823 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp differ

1 0

[reactos] 01/01: [NTUSER] Empower co_UserActivateKeyboardLayout (#4608)
by Katayama Hirofumi MZ 16 Aug '22

16 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e44e15184042bd94fb43d… commit e44e15184042bd94fb43d5e6126610ebaf9244da Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 16 22:03:54 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 16 22:03:54 2022 +0900 [NTUSER] Empower co_UserActivateKeyboardLayout (#4608) - Add code to co_UserActivateKeyboardLayout function for IME. - Add IntImmActivateLayout helper function. CORE-11700 --- win32ss/user/ntuser/kbdlayout.c | 127 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 117 insertions(+), 10 deletions(-) diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index c4d97267101..90ad390cac4 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -10,6 +10,7 @@ */ #include <win32k.h> +#include <ddk/immdev.h> // Was included only because of CP_ACP and required the // definition of SYSTEMTIME in ndk\rtltypes.h @@ -607,6 +608,31 @@ co_UserActivateKbl(PTHREADINFO pti, PKL pKl, UINT Flags) return pklPrev; } +// Win: xxxImmActivateLayout +VOID APIENTRY +IntImmActivateLayout( + _Inout_ PTHREADINFO pti, + _Inout_ PKL pKL) +{ + PWND pImeWnd; + HWND hImeWnd; + USER_REFERENCE_ENTRY Ref; + + if (pti->KeyboardLayout == pKL) + return; + + pImeWnd = pti->spwndDefaultIme; + if (pImeWnd) + { + UserRefObjectCo(pImeWnd, &Ref); + hImeWnd = UserHMGetHandle(pImeWnd); + co_IntSendMessage(hImeWnd, WM_IME_SYSTEM, IMS_ACTIVATELAYOUT, (LPARAM)pKL->hkl); + UserDerefObjectCo(pImeWnd); + } + + UserAssignmentLock((PVOID*)&pti->KeyboardLayout, pKL); +} + /* Win: xxxInternalActivateKeyboardLayout */ HKL APIENTRY co_UserActivateKeyboardLayout( @@ -614,23 +640,104 @@ co_UserActivateKeyboardLayout( _In_ ULONG uFlags, _Inout_ PWND pWnd) { - HKL hKL = pKL->hkl; - PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + HKL hOldKL = NULL; + PKL pOldKL = NULL; + PTHREADINFO pti = GetW32ThreadInfo(); + PWND pTargetWnd, pImeWnd; + HWND hTargetWnd, hImeWnd; + USER_REFERENCE_ENTRY Ref1, Ref2; + PCLIENTINFO ClientInfo = pti->pClientInfo; + + if (pti->KeyboardLayout) + { + pOldKL = pti->KeyboardLayout; + if (pOldKL) + hOldKL = pOldKL->hkl; + } + + if (uFlags & KLF_RESET) + { + /* FIXME */ + } + + if (!(uFlags & KLF_SETFORPROCESS) && pKL == pti->KeyboardLayout) + return hOldKL; + + pKL->wchDiacritic = 0; - if (pKL != pti->KeyboardLayout) + if (pOldKL) + UserRefObjectCo(pOldKL, &Ref1); + + if (pti->TIF_flags & TIF_CSRSSTHREAD) + { + UserAssignmentLock((PVOID*)&pti->KeyboardLayout, pKL); + ClientInfo->CodePage = pKL->CodePage; + } + else if (uFlags & KLF_SETFORPROCESS) + { + /* FIXME */ + } + else { - /* Activate layout for current thread */ - co_UserActivateKbl(pti, pKL, uFlags); + if (IS_IMM_MODE()) + IntImmActivateLayout(pti, pKL); + else + UserAssignmentLock((PVOID*)&pti->KeyboardLayout, pKL); + + if (!(pti->TIF_flags & TIF_INCLEANUP)) + { + ClientInfo->CodePage = pKL->CodePage; + ClientInfo->hKL = pKL->hkl; + } + } + if (gptiForeground && (gptiForeground->ppi == pti->ppi)) + { /* Send shell message */ - if (!(uFlags & KLF_NOTELLSHELL)) - co_IntShellHookNotify(HSHELL_LANGUAGE, 0, (LPARAM)hKL); + co_IntShellHookNotify(HSHELL_LANGUAGE, 0, (LPARAM)pKL->hkl); + } + + if (pti->MessageQueue) + { + /* Determine the target window */ + pTargetWnd = pti->MessageQueue->spwndFocus; + if (!pTargetWnd) + { + pTargetWnd = pti->MessageQueue->spwndActive; + if (!pTargetWnd) + pTargetWnd = pWnd; + } + + /* Send WM_INPUTLANGCHANGE message */ + if (pTargetWnd) + { + UserRefObjectCo(pTargetWnd, &Ref2); + hTargetWnd = UserHMGetHandle(pTargetWnd); + co_IntSendMessage(hTargetWnd, WM_INPUTLANGCHANGE, pKL->iBaseCharset, (LPARAM)pKL->hkl); + UserDerefObjectCo(pTargetWnd); + } } - /* FIXME: KLF_RESET - KLF_SHIFTLOCK */ + /* Send WM_IME_SYSTEM:IMS_SENDNOTIFICATION message if necessary */ + if (pti && !(pti->TIF_flags & TIF_CSRSSTHREAD)) + { + if (IS_IME_HKL(pKL->hkl) || (gpsi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) + { + pImeWnd = pti->spwndDefaultIme; + if (pImeWnd) + { + UserRefObjectCo(pImeWnd, &Ref2); + BOOL bProcess = !!(pti->TIF_flags & KLF_SETFORPROCESS); + hImeWnd = UserHMGetHandle(pImeWnd); + co_IntSendMessage(hImeWnd, WM_IME_SYSTEM, IMS_SENDNOTIFICATION, bProcess); + UserDerefObjectCo(pImeWnd); + } + } + } - return hKL; + if (pOldKL) + UserDerefObjectCo(pOldKL); + return hOldKL; } // Win: ReorderKeyboardLayouts

1 0

[reactos] 01/01: [NTOS:SE] Fix the primary group assignation in TokenPrimaryGroup class case
by George Bișoc 16 Aug '22

16 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86bde3c76a1c6695e6396… commit 86bde3c76a1c6695e63961d16dfff85872a32bfd Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon Aug 15 22:03:51 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Aug 16 13:05:44 2022 +0200 [NTOS:SE] Fix the primary group assignation in TokenPrimaryGroup class case With current master, what happens is that when someone wants to assign a new primary group SID for an access token, it results in an instant page fault because the primary group variable doesn't get assigned the dynamic part's address. So the primary group variable gets an address which is basically a representation of the ACL size, hence the said address is bogus and it's where the page fault kicks in. CORE-18249 --- ntoskrnl/se/tokencls.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/se/tokencls.c b/ntoskrnl/se/tokencls.c index 4810996114e..34127c477f2 100644 --- a/ntoskrnl/se/tokencls.c +++ b/ntoskrnl/se/tokencls.c @@ -1227,6 +1227,7 @@ NtSetInformationToken( if (TokenInformationLength >= sizeof(TOKEN_PRIMARY_GROUP)) { PTOKEN_PRIMARY_GROUP tpg = (PTOKEN_PRIMARY_GROUP)TokenInformation; + ULONG AclSize; ULONG_PTR PrimaryGroup; PSID InputSid = NULL, CapturedSid; ULONG PrimaryGroupIndex, NewDynamicLength; @@ -1309,9 +1310,15 @@ NtSetInformationToken( /* Take away available space from the dynamic area */ Token->DynamicAvailable -= RtlLengthSid(Token->UserAndGroups[PrimaryGroupIndex].Sid); - /* And assign the primary group */ - PrimaryGroup = (ULONG_PTR)(Token->DynamicPart) + Token->DefaultDacl ? - Token->DefaultDacl->AclSize : 0; + /* + * And assign the new primary group. For that + * we have to make sure where the primary group + * is going to stay in memory, so if this token + * has a default DACL then add up its size with + * the address of the dynamic part. + */ + AclSize = Token->DefaultDacl ? Token->DefaultDacl->AclSize : 0; + PrimaryGroup = (ULONG_PTR)(Token->DynamicPart) + AclSize; RtlCopySid(RtlLengthSid(Token->UserAndGroups[PrimaryGroupIndex].Sid), (PVOID)PrimaryGroup, Token->UserAndGroups[PrimaryGroupIndex].Sid);

1 0

[reactos] 01/01: [TRANSLATION] Improve Korean (ko-KR) translation (#4574)
by Luke Luo 16 Aug '22

16 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=626fd4d240f870a39142a… commit 626fd4d240f870a39142ab974105430225878cf7 Author: Luke Luo <njlyf2011(a)hotmail.com> AuthorDate: Tue Aug 16 18:02:25 2022 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 16 13:02:25 2022 +0300 [TRANSLATION] Improve Korean (ko-KR) translation (#4574) - [SHELL32] Update Korean translation - [EXPLORER] Update Korean translation Reviewed-by: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> Reviewed-by: Seungju Kim <admin(a)manateeshome.com> Reviewed-by: Stanislav Motylkov <x86corez(a)gmail.com> --- base/shell/explorer/lang/ko-KR.rc | 72 ++++++------ dll/win32/shell32/lang/ko-KR.rc | 227 ++++++++++++++++++++------------------ 2 files changed, 156 insertions(+), 143 deletions(-) diff --git a/base/shell/explorer/lang/ko-KR.rc b/base/shell/explorer/lang/ko-KR.rc index e28bca70496..a54b4939977 100644 --- a/base/shell/explorer/lang/ko-KR.rc +++ b/base/shell/explorer/lang/ko-KR.rc @@ -1,4 +1,10 @@ -/* Korean translation by manatails007 - Seungju Kim */ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Korean resource file + * TRANSLATORS: Copyright 2008 Seungju Kim aka manatails007 <admin(a)manateeshome.com> + * Copyright 2022 Luke Luo <njlyf2011(a)hotmail.com> + */ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT @@ -7,16 +13,16 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT + MENUITEM "날짜/시간 조정(&A)", ID_SHELL_CMD_ADJUST_DAT MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF MENUITEM SEPARATOR MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP + MENUITEM "바탕 화면 보기(&S)", ID_SHELL_CMD_SHOW_DESKTOP MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR - MENUITEM "Task Manager", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM "작업 관리자", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR MENUITEM "작업 표시줄 잠그기(&L)", ID_LOCKTASKBAR MENUITEM "속성(&R)", ID_SHELL_CMD_PROPERTIES @@ -66,7 +72,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Taskbar" FONT 9, "굴림", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "작업 표시줄 모양", IDC_STATIC, 6, 6, 240, 104 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 @@ -84,11 +90,11 @@ END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Start Menu" +CAPTION "시작 메뉴" FONT 9, "굴림", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + AUTORADIOBUTTON "시작 메뉴(&S)", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Classic Start &menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 @@ -99,7 +105,7 @@ END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Customize Notifications" +CAPTION "알림 사용자 지정" FONT 9, "굴림" BEGIN LTEXT "ReactOS displays icons for active and urgent notifications, and hides inactive ones. You can change this behavior for items in the list below.", IDC_STATIC, 6, 6, 220, 30 @@ -107,50 +113,50 @@ BEGIN CONTROL "", IDC_NOTIFICATION_LIST, "SysListView32", WS_CLIPSIBLINGS | WS_BORDER | 0x00008005, 6, 50, 220, 128 COMBOBOX IDC_NOTIFICATION_BEHAVIOUR, 103, 178, 78, 200, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_CLIPSIBLINGS PUSHBUTTON "&Restore Defaults", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 - DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + DEFPUSHBUTTON "확인", IDOK, 122, 220, 50, 14 + PUSHBUTTON "취소", IDCANCEL, 176, 220, 50, 14 END IDD_CLASSICSTART_CUSTOMIZE DIALOGEX 0, 0, 232, 240, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Customize Classic Start Menu" +CAPTION "클래식 시작 메뉴 사용자 지정" FONT 9, "굴림" BEGIN - GROUPBOX "Start menu", IDC_STATIC, 8, 7, 218, 114 + GROUPBOX "시작 메뉴", IDC_STATIC, 8, 7, 218, 114 ICON IDI_STARTMENU2, IDC_STATIC, 19, 17, 20, 20 - LTEXT "You can customize your Start menu by adding or removing items.", IDC_STATIC, 48, 17, 108, 39 - PUSHBUTTON "A&dd...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 - PUSHBUTTON "&Remove...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 - PUSHBUTTON "Ad&vanced", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 - PUSHBUTTON "&Sort", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 + LTEXT "항목을 추가하거나 제거하여 시작 메뉴를 사용자 정의할 수 있습니다.", IDC_STATIC, 48, 17, 108, 39 + PUSHBUTTON "추가(&D)...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 + PUSHBUTTON "제거(&R)...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 + PUSHBUTTON "고급(&V)", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 + PUSHBUTTON "정렬(&S)", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 ICON IDI_RECYCLEBIN, IDC_STATIC, 20, 85, 20, 20 LTEXT "To remove records of recently accessed documents, programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33 - PUSHBUTTON "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 - LTEXT "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 8 + PUSHBUTTON "지우기(&C)", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 + LTEXT "시작 메뉴 고급 옵션(&T):", IDC_STATIC, 8, 129, 150, 8 CONTROL "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE - DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + DEFPUSHBUTTON "확인", IDOK, 122, 220, 50, 14 + PUSHBUTTON "취소", IDCANCEL, 176, 220, 50, 14 END IDD_FILENAME_WARNING DIALOGEX 0, 0, 272, 81, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "File Name Warning" +CAPTION "파일 이름 경고" FONT 9, "굴림" BEGIN - DEFPUSHBUTTON "&Ignore", IDIGNORE, 215, 60, 50, 14 - PUSHBUTTON "&Rename", IDC_FILE_RENAME, 159, 60, 50, 14 + DEFPUSHBUTTON "무시(&I)", IDIGNORE, 215, 60, 50, 14 + PUSHBUTTON "이름 바꾸기(&R)", IDC_FILE_RENAME, 159, 60, 50, 14 LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP - AUTOCHECKBOX "&Don't perform this check at startup", IDC_NOTCHECK, 7, 62, 139, 10 + AUTOCHECKBOX "시작할 때 확인 안 함(&D)", IDC_NOTCHECK, 7, 62, 139, 10 ICON 32515, IDC_STATIC, 7, 7, 21, 20 LTEXT "There is a file or folder on your computer called %s which could cause certain applications to not function correctly. Renaming it to %s would solve this problem. Would you like to rename it now?", IDC_STATIC, 34, 7, 224, 37 END IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 STYLE DS_SETFONT | WS_CAPTION | WS_CHILD | WS_DISABLED -CAPTION "Advanced" +CAPTION "고급" FONT 9, "굴림" BEGIN - GROUPBOX "Start menu settings ", IDC_STATIC, 7, 7, 238, 42 + GROUPBOX "시작 메뉴 설정", IDC_STATIC, 7, 7, 238, 42 AUTOCHECKBOX "&Open submenus when I pause on them with my mouse", IDC_AUTOOPEN, 14, 21, 224, 10 AUTOCHECKBOX "Highlight &newly installed programs", IDC_HIGHLIGHT, 14, 35, 224, 10 LTEXT "Start &menu items:", IDC_STATIC, 7, 53, 238, 8 @@ -169,8 +175,8 @@ BEGIN GROUPBOX "Select an icon size for programs ", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE ICON IDC_SMALLICON, 151, 18, 20, 20, SS_CENTERIMAGE - AUTORADIOBUTTON "&Large icons", IDC_CHOOSELARGE, 43, 25, 53, 10 - AUTORADIOBUTTON "&Small icons", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "큰 아이콘(&L)", IDC_CHOOSELARGE, 43, 25, 53, 10 + AUTORADIOBUTTON "작은 아이콘(&S)", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP GROUPBOX "Programs ", IDC_STATIC, 7, 49, 238, 70 LTEXT "The Start menu contains shortcuts to the programs you use most often. Clearing the list of shortcuts does not delete the programs.", IDC_STATIC, 14, 63, 224, 20 LTEXT "&Number of programs on Start menu:", IDC_STATIC, 14, 86, 112, 8 @@ -188,13 +194,13 @@ STRINGTABLE BEGIN IDS_START "시작" IDS_PROPERTIES "속성(&R)" - IDS_OPEN_ALL_USERS "열기 - All Users(&P)" - IDS_EXPLORE_ALL_USERS "탐색 - All Users(&X)" + IDS_OPEN_ALL_USERS "열기 - 모든 사용자(&P)" + IDS_EXPLORE_ALL_USERS "탐색 - 모든 사용자(&X)" IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE BEGIN - IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu" - IDS_RESTORE_ALL "&Show Open Windows" + IDS_TASKBAR_STARTMENU_PROP_CAPTION "작업 표시줄 및 시작 메뉴" + IDS_RESTORE_ALL "열린 창 보기(&S)" END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 8f77796c636..bc26bfff6a8 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Shell32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Korean resource file + * TRANSLATORS: Copyright 2022 Luke Luo <njlyf2011(a)hotmail.com> + */ + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT MENU_001 MENUEX @@ -64,11 +71,11 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "C&ut", IDM_CUT - MENUITEM "&Copy", IDM_COPY - MENUITEM "Paste", IDM_INSERT + MENUITEM "잘라내기(&U)", IDM_CUT + MENUITEM "복사(&C)", IDM_COPY + MENUITEM "붙여넣기", IDM_INSERT MENUITEM SEPARATOR - MENUITEM "Create &Link", IDM_CREATELINK + MENUITEM "바로 가기 만들기(&L)", IDM_CREATELINK MENUITEM "&Delete", IDM_DELETE MENUITEM "&Rename", IDM_RENAME MENUITEM SEPARATOR @@ -80,7 +87,7 @@ IDM_DRAGFILE MENU BEGIN POPUP "" BEGIN - MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "여기에 복사(&C)", IDM_COPYHERE MENUITEM "&Move here", IDM_MOVEHERE MENUITEM "Create &shortcuts here", IDM_LINKHERE MENUITEM SEPARATOR @@ -90,11 +97,11 @@ END IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Browse for Folder" +CAPTION "폴더 찾아보기" FONT 9, "굴림" BEGIN - DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "확인", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "취소", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 @@ -102,16 +109,16 @@ END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Browse for Folder" +CAPTION "폴더 찾아보기" FONT 9, "굴림" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | WS_GROUP CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 - PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "새 폴더 만들기(&M)", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "확인", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "취소", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP END IDD_YESTOALL_MSGBOX DIALOGEX 200, 100, 280, 90 @@ -153,129 +160,129 @@ IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 STYLE DS_SHELLFONT | WS_CHILD FONT 9, "굴림" BEGIN - LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 + LTEXT "ReactOS는 다음 단체의 도움으로 제공됩니다:", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END IDD_RUN DIALOGEX 0, 0, 227, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Run" +CAPTION "실행" FONT 9, "굴림" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 185, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "열기(&O):", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 - DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 160, 70, 59, 14, WS_TABSTOP + DEFPUSHBUTTON "확인", IDOK, 36, 70, 59, 14, WS_TABSTOP + PUSHBUTTON "취소", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP + PUSHBUTTON "찾아보기(&B)...", 12288, 160, 70, 59, 14, WS_TABSTOP END IDD_SHORTCUT_PROPERTIES DIALOGEX 0, 0, 235, 215 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Shortcut" -FONT 9, "굴림", 0, 0, 0x0 +CAPTION "바로 가기" +FONT 9, "굴림", 0, 0, 0x1 BEGIN ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + LTEXT "대상 형식:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + LTEXT "대상 위치:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + LTEXT "대상(&T):", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + LTEXT "시작 위치(&S):", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + LTEXT "바로 가기 키(&K):", IDC_SHORTCUT_KEY, 8, 117, 68, 10 CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + LTEXT "실행(&R):", IDC_SHORTCUT_RUN, 8, 136, 68, 10 COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + LTEXT "설명(&C)...", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT + PUSHBUTTON "대상 찾기(&F)...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "아이콘 변경(&C)...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "고급(&D)...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "Extended Properties" -FONT 9, "굴림", 0, 0, 0x0 +CAPTION "고급 속성" +FONT 9, "굴림", 0, 0, 0x1 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "확인", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "중단", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "General" -FONT 9, "굴림", 0, 0, 0x0 +CAPTION "일반" +FONT 9, "굴림", 0, 0, 0x1 BEGIN ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT - LTEXT "Type of file:", 14004, 8, 40, 55, 10 - CONTROL "Folder", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10 + LTEXT "파일 형식:", 14004, 8, 40, 55, 10 + CONTROL "폴더", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10 LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Location:", 14008, 8, 56, 55, 10 + LTEXT "위치:", 14008, 8, 56, 55, 10 EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP - LTEXT "Size:", 14010, 8, 72, 55, 10 + LTEXT "크기:", 14010, 8, 72, 55, 10 EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Size on disk:", 140101, 8, 88, 55, 10 + LTEXT "디스크 할당 크기:", 140101, 8, 88, 55, 10 EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "Contains:", 14026, 8, 104, 55, 10 EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 120, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Created:", 14014, 8, 128, 55, 10 + LTEXT "만든 날짜:", 14014, 8, 128, 55, 10 EDITTEXT 14015, 58, 128, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Attributes:", 14020, 8, 152, 46, 10 - AUTOCHECKBOX "&Read-only", 14021, 58, 151, 70, 10 - AUTOCHECKBOX "&Hidden", 14022, 126, 151, 70, 10 - AUTOCHECKBOX "&Archive", 14023, 181, 151, 70, 10 - PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "읽기 전용(&R)", 14021, 58, 151, 70, 10 + AUTOCHECKBOX "숨김(&H)", 14022, 126, 151, 70, 10 + AUTOCHECKBOX "보관(&A)", 14023, 181, 151, 70, 10 + PUSHBUTTON "고급(&D)...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "General" -FONT 9, "굴림", 0, 0, 0x0 +CAPTION "일반" +FONT 9, "굴림", 0, 0, 0x1 BEGIN ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "파일 형식:", 14004, 8, 35, 50, 10 CONTROL "File", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10 - LTEXT "Opens with:", 14006, 8, 53, 50, 10 + LTEXT "연결 프로그램:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE - PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "변경(&C)...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Location:", 14008, 8, 75, 45, 10 + LTEXT "위치:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP - LTEXT "Size:", 14010, 8, 91, 45, 10 + LTEXT "크기:", 14010, 8, 91, 45, 10 EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Size on disk:", 140112, 8, 107, 55, 10 + LTEXT "디스크 할당 크기:", 140112, 8, 107, 55, 10 EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Created:", 14014, 8, 131, 45, 10 + LTEXT "만든 날짜:", 14014, 8, 131, 45, 10 EDITTEXT 14015, 58, 131, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Modified:", 14016, 8, 147, 45, 10 + LTEXT "수정한 날짜:", 14016, 8, 147, 45, 10 EDITTEXT 14017, 58, 147, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Accessed:", 14018, 8, 163, 45, 10 + LTEXT "액세스한 날짜:", 14018, 8, 163, 45, 10 EDITTEXT 14019, 58, 163, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Attributes:", 14020, 8, 189, 45, 10 - AUTOCHECKBOX "&Read-only", 14021, 58, 188, 67, 10 - AUTOCHECKBOX "&Hidden", 14022, 126, 188, 50, 10 - AUTOCHECKBOX "&Archive", 14023, 181, 188, 49, 10 - PUSHBUTTON "A&dvanced...", 14028, 180, 185, 50, 15, WS_TABSTOP + AUTOCHECKBOX "읽기 전용(&R)", 14021, 58, 188, 67, 10 + AUTOCHECKBOX "숨김(&H)", 14022, 126, 188, 50, 10 + AUTOCHECKBOX "보관(&A)", 14023, 181, 188, 49, 10 + PUSHBUTTON "고급(&D)...", 14028, 180, 185, 50, 15, WS_TABSTOP END IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215 @@ -298,8 +305,8 @@ END IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 9, "굴림", 0, 0, 0x0 +CAPTION "일반" +FONT 9, "굴림", 0, 0, 0x1 BEGIN ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL @@ -331,8 +338,8 @@ END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Tools" -FONT 9, "굴림", 0, 0, 0x0 +CAPTION "도구" +FONT 9, "굴림", 0, 0, 0x1 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 @@ -350,15 +357,15 @@ END IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Hardware" -FONT 9, "굴림", 0, 0, 0x0 +CAPTION "하드웨어" +FONT 9, "굴림", 0, 0, 0x1 BEGIN END IDD_RUN_AS DIALOGEX 0, 0, 240, 190 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Run As" -FONT 9, "굴림", 0, 0, 0x0 +CAPTION "다음 계정으로 실행" +FONT 9, "굴림", 0, 0, 0x1 BEGIN LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 CHECKBOX "Current User %s", 14000, 10, 45, 150, 10 @@ -407,8 +414,8 @@ END IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "General" -FONT 9, "굴림", 0, 0, 0x0 +CAPTION "일반" +FONT 9, "굴림", 0, 0, 0x1 BEGIN GROUPBOX "Tasks", -1, 7, 10, 249, 45 CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20 @@ -462,7 +469,7 @@ END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Confirm File Replace" +CAPTION "파일 교체 확인" FONT 9, "굴림" BEGIN DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14 @@ -625,16 +632,16 @@ END IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Icon" +CAPTION "아이콘 변경" FONT 9, "굴림", 400, 0, 0x1 BEGIN - LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 + LTEXT "파일에서 아이콘 찾기(&L):", -1, 7, 7, 179, 10 + PUSHBUTTON "찾아보기(&B)...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL - LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LTEXT "아래 목록에서 아이콘 선택:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 + DEFPUSHBUTTON "확인", IDOK, 81, 179, 50, 14 + PUSHBUTTON "취소", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 @@ -725,7 +732,7 @@ END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 CAPTION "Problem with Shortcut" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" +FONT 9, "굴림" BEGIN ICON 0, IDC_LINK_PROBLEM_ICON, 5, 5, 0, 0 LTEXT "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly.", IDC_LINK_PROBLEM_LABEL1, 35, 5, 210, 35 @@ -762,11 +769,11 @@ BEGIN IDS_SHV_COLUMN_MODEL "Model" /* special folders */ - IDS_DESKTOP "Desktop" - IDS_MYCOMPUTER "My Computer" - IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" - IDS_CONTROLPANEL "Control Panel" - IDS_ADMINISTRATIVETOOLS "Administrative Tools" + IDS_DESKTOP "바탕 화면" + IDS_MYCOMPUTER "내 컴퓨터" + IDS_RECYCLEBIN_FOLDER_NAME "휴지통" + IDS_CONTROLPANEL "제어판" + IDS_ADMINISTRATIVETOOLS "관리 도구" /* special folders descriptions */ IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." @@ -778,23 +785,23 @@ BEGIN IDS_ABOUT_VERSION_STRING "Version %S (%S)" /* context menus */ - IDS_VIEW_LARGE "Lar&ge Icons" - IDS_VIEW_SMALL "S&mall Icons" + IDS_VIEW_LARGE "큰 아이콘(&G)" + IDS_VIEW_SMALL "작은 아이콘(&M)" IDS_VIEW_LIST "&List" IDS_VIEW_DETAILS "&Details" IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "Create &Link" - IDS_COPY "&Copy" - IDS_DELETE "Delete" + IDS_COPY "복사(&C):" + IDS_DELETE "삭제" IDS_PROPERTIES "Properties" - IDS_CUT "C&ut" + IDS_CUT "잘라내기(&U)" IDS_RESTORE "Restore" IDS_FORMATDRIVE "Format..." - IDS_RENAME "Rename" - IDS_PASTE "Paste" - IDS_EJECT "Eject" - IDS_DISCONNECT "Disconnect" + IDS_RENAME "이름 바꾸기" + IDS_PASTE "붙여넣기" + IDS_EJECT "꺼내기" + IDS_DISCONNECT "연결 끊기" IDS_OPENFILELOCATION "Open f&ile location" IDS_SENDTO_MENU "Se&nd To" @@ -853,7 +860,7 @@ BEGIN /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Start Menu\\Programs" - IDS_PERSONAL "My Documents" + IDS_PERSONAL "내 문서" IDS_FAVORITES "Favorites" IDS_STARTUP "Start Menu\\Programs\\StartUp" IDS_RECENT "Recent" @@ -871,7 +878,7 @@ BEGIN IDS_COOKIES "Cookies" IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" - IDS_MYPICTURES "My Pictures" + IDS_MYPICTURES "내 사진" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" @@ -879,15 +886,15 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_NETWORKPLACE "My Network Places" + IDS_NETWORKPLACE "내 네트워크 환경" IDS_NEWFOLDER "New Folder" - IDS_DRIVE_FIXED "Local Disk" - IDS_DRIVE_CDROM "CD Drive" - IDS_DRIVE_NETWORK "Network Disk" - IDS_DRIVE_FLOPPY "3.5 Floppy" - IDS_DRIVE_REMOVABLE "Removable Disk" + IDS_DRIVE_FIXED "로컬 디스크" + IDS_DRIVE_CDROM "CD 드라이브" + IDS_DRIVE_NETWORK "네트워크 디스크" + IDS_DRIVE_FLOPPY "3.5 플로피" + IDS_DRIVE_REMOVABLE "이동식 디스크" IDS_FS_UNKNOWN "Unknown" /* Open With */ @@ -901,13 +908,13 @@ BEGIN FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" - IDS_FOLDER_OPTIONS "Folder Options" + IDS_FOLDER_OPTIONS "폴더 옵션" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - IDS_EMPTY_BITBUCKET "Empty Recycle Bin" - IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" - IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_EMPTY_BITBUCKET "휴지통 비우기" + IDS_PICK_ICON_TITLE "아이콘 선택" + IDS_PICK_ICON_FILTER "아이콘 파일 (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "실행 파일 (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." @@ -917,7 +924,7 @@ BEGIN IDS_NONE "(None)" /* Friendly File Type Names */ - IDS_DIRECTORY "Folder" + IDS_DIRECTORY "폴더" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" @@ -948,7 +955,7 @@ BEGIN IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as..." - IDS_EDIT_VERB "Edit" + IDS_EDIT_VERB "편집" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" IDS_CMD_VERB "Command Prompt here" @@ -1020,13 +1027,13 @@ BEGIN IDS_COPYTOMENU "Copy to &folder..." IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" - IDS_COPYBUTTON "Copy" + IDS_COPYBUTTON "복사" IDS_MOVETOMENU "Mo&ve to folder..." IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." IDS_MOVEITEMS "Move Items" IDS_MOVEBUTTON "Move" - IDS_SYSTEMFOLDER "System Folder" + IDS_SYSTEMFOLDER "시스템 폴더" /* For IDD_LOG_OFF_FANCY */ IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session."

1 0

[reactos] 01/01: [TRANSLATION] Update Traditional Chinese (zh-TW) translation - Jun 2022 (#4570)
by Chan Chilung 16 Aug '22

16 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac87259fa2ba82b313da2… commit ac87259fa2ba82b313da287457daff632fe6236b Author: Chan Chilung <eason066(a)gmail.com> AuthorDate: Tue Aug 16 10:00:11 2022 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 16 13:00:11 2022 +0300 [TRANSLATION] Update Traditional Chinese (zh-TW) translation - Jun 2022 (#4570) - [REG] Update zh-TW translation - [DISKPART] Update zh-TW translation - [HHCTRL.OCX] Update zh-TW translation --- base/applications/cmdutils/reg/lang/zh-TW.rc | 194 ++++---- base/system/diskpart/diskpart_msg.mc | 682 ++++++++++++--------------- base/system/diskpart/lang/zh-TW.rc | 214 +++++---- dll/win32/hhctrl.ocx/lang/Zh.rc | 7 +- 4 files changed, 522 insertions(+), 575 deletions(-) diff --git a/base/applications/cmdutils/reg/lang/zh-TW.rc b/base/applications/cmdutils/reg/lang/zh-TW.rc index bf1f3f8d9fa..e87d531b613 100644 --- a/base/applications/cmdutils/reg/lang/zh-TW.rc +++ b/base/applications/cmdutils/reg/lang/zh-TW.rc @@ -3,7 +3,7 @@ * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Chinese (Traditional) resource file * TRANSLATORS: Copyright 2016 Henry Tang Ih <henrytang2(a)hotmail.com> - * Copyright 2021 Chan Chilung <eason066(a)gmail.com> + * Copyright 2021-2022 Chan Chilung <eason066(a)gmail.com> * REFERENCES: Wine's Chinese (Traditional) resource translation */ @@ -11,99 +11,99 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE { - STRING_USAGE, "Usage:\n\ - REG [operation] [parameters]\n\n\ -Supported operations:\n\ + STRING_USAGE, "用法:\n\ + REG [操作] [參數]\n\n\ +支援的操作:\n\ ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n\n\ -For help on a specific operation, type:\n\ - REG [operation] /?\n\n" +要取得指定操作的說明，請輸入:\n\ + REG [操作] /?\n\n" - STRING_ADD_USAGE, "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n\n\ - Adds a key to the registry or adds a new value to a given registry key.\n\n\ - <key>\n\ - The registry key to add or, if either [/v] or [/ve] is specified,\n\ - the key in which to add the new registry data.\n\n\ - Format: ROOT\\Subkey\n\n\ - ROOT: A predefined registry key. This must be one of the following:\n\n\ + STRING_ADD_USAGE, "REG ADD <機碼> [/v 值名稱 | /ve] [/t 類型] [/s 分隔符號] [/d 資料] [/f]\n\n\ + 新增一個機碼到登錄，或新增值到給定的登錄機碼。\n\n\ + <機碼>\n\ + 要新增的機碼，如果指定了 [/v] 或 [/ve]，\n\ + 則會在該機碼新增登錄資料。\n\n\ + 格式: ROOT\\Subkey\n\n\ + ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n\n\ HKEY_LOCAL_MACHINE | HKLM\n\ HKEY_CURRENT_USER | HKCU\n\ HKEY_CLASSES_ROOT | HKCR\n\ HKEY_USERS | HKU\n\ HKEY_CURRENT_CONFIG | HKCC\n\n\ - Subkey: The full path to a registry key under a given ROOT key.\n\n\ - /v <value_name>\n\ - The name of the registry value to add.\n\n\ + Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n\n\ + /v <值名稱>\n\ + 要新增的登錄值的名稱。\n\n\ /ve\n\ - Add an unnamed registry value. This option modifies the (Default)\n\ - registry value.\n\n\ - /t <type>\n\ - The type of data to add to the registry. If [/t] is specified,\n\ - <type> must be one of the following:\n\n\ + 新增未命名的登錄值。這個選項會修改 (預設) 的\n\ + 登錄值。\n\n\ + /t <類型>\n\ + 要新增到登錄的資料類型。如果指定了 [/t]，\n\ + <類型> 必須是下列的其中一個:\n\n\ REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n\ REG_DWORD | REG_BINARY | REG_NONE\n\n\ - If [/t] is not specified, the default data type is REG_SZ.\n\n\ - /s <separator>\n\ - The character used to separate strings in REG_MULTI_SZ data.\n\ - If [/s] is not specified, the default separator is \\0.\n\n\ - /d <data>\n\ - The data to add to the new registry value.\n\n\ + 如果未指定 [/t]，資料類型將預設為 REG_SZ。\n\n\ + /s <分隔符號>\n\ + 指定一個用於分隔 REG_MULTI_SZ 資料字串的字元。\n\ + 如果未指定 [/s]，分隔符號會預設為 \\0。\n\n\ + /d <資料>\n\ + 要新增給新的登錄值的資料。\n\n\ /f\n\ - Modify the registry without prompting for confirmation.\n\n" + 修改登錄項目而不需確認提示。\n\n" - STRING_DELETE_USAGE, "REG DELETE <key> [/v value_name | /ve | /va] [/f]\n\n\ - Deletes a registry key (including all subkeys and values), or deletes\n\ - one or more values from a given registry key.\n\n\ - <key>\n\ - The registry key to delete or, if one of [/v], [/ve] or [/va] is\n\ - specified, the registry key in which to delete one or more values.\n\n\ - Format: ROOT\\Subkey\n\n\ - ROOT: A predefined registry key. This must be one of the following:\n\n\ + STRING_DELETE_USAGE, "REG DELETE <金> [/v 值名稱 | /ve | /va] [/f]\n\n\ + 刪除一個登錄機碼 (所有子機碼和值)，\n\ + 或從給定的登錄機碼刪除一個或多個值。\n\n\ + <機碼>\n\ + 要刪除的登錄機碼。如果指定了 [/v]、[/ve] 或 [/va]，\n\ + 則可刪除登錄機碼內的一個或多個值。\n\n\ + 格式: ROOT\\Subkey\n\n\ + ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n\n\ HKEY_LOCAL_MACHINE | HKLM\n\ HKEY_CURRENT_USER | HKCU\n\ HKEY_CLASSES_ROOT | HKCR\n\ HKEY_USERS | HKU\n\ HKEY_CURRENT_CONFIG | HKCC\n\n\ - Subkey: The full path to a registry key under a given ROOT key.\n\n\ - /v <value_name>\n\ - The name of the registry value to delete.\n\n\ + Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n\n\ + /v <值名稱>\n\ + 要刪除的登錄值的名稱。\n\n\ /ve\n\ - Delete an unnamed registry value. This option deletes the (Default)\n\ - registry value.\n\n\ + 刪除未命名的登錄值。這個選項會刪除 (預設) 的\n\ + 登錄值。\n\n\ /va\n\ - Delete all values from a registry key.\n\n\ + 刪除登錄機碼的所有值。\n\n\ /f\n\ - Delete a registry key (including all subkeys and values) without\n\ - prompting for confirmation.\n\n" + 刪除一個登錄機碼 (包括所有子機碼和值)\n\ + 而不需確認提示。\n\n" - STRING_QUERY_USAGE, "REG QUERY <key> [/v value_name | /ve] [/s]\n\n\ - Queries a specified registry key and lists all immediate subkeys, values\n\ - and data within that key. Use [/s] to recursively query each subkey.\n\n\ - <key>\n\ - The registry key to query.\n\n\ - Format: ROOT\\Subkey\n\n\ - ROOT: A predefined registry key. This must be one of the following:\n\n\ + STRING_QUERY_USAGE, "REG QUERY <機碼> [/v 值名稱 | /ve] [/s]\n\n\ + 查詢指定的登錄機碼，並列出該機碼中的所有即時子機碼、值和資料。\n\ + 使用 [/s] 來遞迴查詢每個子機碼。\n\n\ + <機碼>\n\ + 要查詢的登錄機碼。\n\n\ + 格式: ROOT\\Subkey\n\n\ + ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n\n\ HKEY_LOCAL_MACHINE | HKLM\n\ HKEY_CURRENT_USER | HKCU\n\ HKEY_CLASSES_ROOT | HKCR\n\ HKEY_USERS | HKU\n\ HKEY_CURRENT_CONFIG | HKCC\n\n\ - Subkey: The full path to a registry key under a given ROOT key.\n\n\ - /v <value_name>\n\ - The name of the registry value to query. If neither [/v] nor [/ve] is\n\ - specified, all values under <key> are listed.\n\n\ + Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n\n\ + /v <值名稱>\n\ + 要查詢的登錄值的名稱。如果未指定 [/v] 或 [/ve]，\n\ + 則會列出 <機碼> 下所有的值。\n\n\ /ve\n\ - Query an unnamed registry value. This option queries the (Default)\n\ - registry value.\n\n\ + 查詢未命名的登錄值。這個選項會查詢 (預設) 的\n\ + 登錄值。\n\n\ /s\n\ - List all registry entries under <key> and its subkeys.\n\n" + 列出 <機碼> 及其子機碼的所有登錄項目。\n\n" - STRING_SUCCESS, "操作成功完成\n" + STRING_SUCCESS, "reg: 操作成功完成\n" STRING_INVALID_KEY, "reg: 無效的登錄機碼名稱\n" STRING_INVALID_CMDLINE, "reg: 無效的命令列參數\n" STRING_NO_REMOTE, "reg: 無法存取遠端機器\n" STRING_VALUE_NONEXIST, "reg: 系統找不到指定的登錄機碼或登錄值\n" STRING_UNSUPPORTED_TYPE, "reg: 不支援的類型\n" - STRING_MISSING_NUMBER, "reg: The option [/d] must be followed by a valid numeric value\n" + STRING_MISSING_NUMBER, "reg: 選項 [/d] 後必須接著一個有效的數字值\n" STRING_MISSING_HEXDATA, "reg: 選項 [/d] 後必須接著一個有效的十六進制值\n" STRING_UNHANDLED_TYPE, "reg: 未處理的登錄資料類型 [/t 0x%1!x!, /d %2]\n" STRING_OVERWRITE_VALUE, "登錄值 '%1' 已經存在。您要覆寫它嗎?" @@ -112,7 +112,7 @@ For help on a specific operation, type:\n\ STRING_ALL, "#msgctxt#All key#A" STRING_YESNO, " (Yes|No)" STRING_YESNOALL, " (Yes|No|All)" - STRING_CANCELLED, "註冊表操作已經取消\n" + STRING_CANCELLED, "reg: 登錄操作已經取消\n" STRING_DEFAULT_VALUE, "(預設)" STRING_DELETE_VALUE, "您確定要刪除登錄值 '%1' 嗎?" STRING_DELETE_VALUEALL, "您確定要刪除 '%1' 下的所有登錄值嗎?" @@ -126,65 +126,65 @@ For help on a specific operation, type:\n\ STRING_FUNC_HELP, "輸入 'REG %1 /?' 以取得說明。\n" STRING_VALUE_NOT_SET, "(沒有設定值)" - STRING_IMPORT_USAGE, "REG IMPORT <file>\n\n\ - Imports keys, values and data from a given file into the registry.\n\n\ - <file>\n\ - The name and path of the registry file to import.\n\n" + STRING_IMPORT_USAGE, "REG IMPORT <檔案>\n\n\ + 從給定的檔案匯入機碼、值和資料到登錄。\n\n\ + <檔案>\n\ + 要匯入的登錄檔案的名稱和路徑。\n\n" STRING_FILE_NOT_FOUND, "reg: 無法找到檔案 '%1'。\n" STRING_ESCAPE_SEQUENCE, "reg: 無法辨識的逸出序列 [\\%1!c!]\n" - STRING_EXPORT_USAGE, "REG EXPORT <key> <file> [/y]\n\n\ - Exports a specified registry key (including all subkeys and values)\n\ - to a file.\n\n\ - <key>\n\ - The registry key to export.\n\n\ - Format: ROOT\\Subkey\n\n\ - ROOT: A predefined registry key. This must be one of the following:\n\n\ + STRING_EXPORT_USAGE, "REG EXPORT <機碼> <檔案> [/y]\n\n\ + 將指定的登錄機碼 (包括所有子機碼和值)\n\ + 匯出到一個檔案。\n\n\ + <機碼>\n\ + 要匯出的登錄機碼。\n\n\ + 格式: ROOT\\Subkey\n\n\ + ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n\n\ HKEY_LOCAL_MACHINE | HKLM\n\ HKEY_CURRENT_USER | HKCU\n\ HKEY_CLASSES_ROOT | HKCR\n\ HKEY_USERS | HKU\n\ HKEY_CURRENT_CONFIG | HKCC\n\n\ - Subkey: The full path to a registry key under a given ROOT key.\n\n\ - <file>\n\ - The name and path of the registry file that will be created.\n\ - This file must have a .reg extension.\n\n\ + Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n\n\ + <檔案>\n\ + 要建立的登錄檔案的名稱和路徑。\n\ + 檔案必須是 .reg 的副檔名。\n\n\ /y\n\ - Overwrite <file> without prompting for confirmation.\n\n" + 覆寫 <檔案> 而不需確認提示。\n\n" STRING_INVALID_SYSTEM_KEY, "reg: 無效的系統金鑰 [%1]\n" STRING_OVERWRITE_FILE, "檔案 '%1' 已經存在。您要覆寫它嗎?" - STRING_KEY_NONEXIST, "reg: Unable to find the specified registry key\n" - STRING_KEY_IMPORT_FAILED, "reg: Unable to import the registry key '%1'\n" + STRING_KEY_NONEXIST, "reg: 找不到指定的登錄值\n" + STRING_KEY_IMPORT_FAILED, "reg: 無法匯入登錄機碼 '%1'\n" STRING_REG_VIEW_USAGE, " /reg:32\n\ - Access the registry using the 32-bit view.\n\n\ + 使用 32 位元登錄檢視來存取機碼。\n\n\ /reg:64\n\ - Access the registry using the 64-bit view.\n\n" - STRING_ACCESS_DENIED, "reg: Unable to access or create the specified registry key\n" + 使用 64 位元登錄檢視來存取機碼。\n\n" + STRING_ACCESS_DENIED, "reg: 無法存取或建立指定的登錄機碼\n" - STRING_COPY_USAGE, "REG COPY <key1> <key2> [/s] [/f]\n\n\ - Copies the contents of a specified registry key to another location.\n\ - By default, this operation only copies registry values. Use [/s] to\n\ - recursively copy all subkeys and values.\n\n\ - <key1>, <key2>\n\ - Registry keys specifying the source (<key1>) and destination (<key2>)\n\ - of the data. If <key2> does not exist, it is created.\n\n\ - Format: ROOT\\Subkey\n\n\ - ROOT: A predefined registry key. This must be one of the following:\n\n\ + STRING_COPY_USAGE, "REG COPY <機碼1> <機碼2> [/s] [/f]\n\n\ + 複製指定登錄機碼的內容到另一個位置。\n\ + 預設情況下，這個操作只會複製登錄值。\n\ + 使用 [/s] 來遞迴複製所有子機碼和值。\n\n\ + <機碼1>，<機碼2>\n\ + 指定登錄機碼的來源 (<機碼1>) 和目標 (<機碼2>) 資料。\n\ + 如果 <機碼2> 不存在，系統將會建立它。\n\n\ + 格式: ROOT\\Subkey\n\n\ + ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n\n\ HKEY_LOCAL_MACHINE | HKLM\n\ HKEY_CURRENT_USER | HKCU\n\ HKEY_CLASSES_ROOT | HKCR\n\ HKEY_USERS | HKU\n\ HKEY_CURRENT_CONFIG | HKCC\n\n\ - Subkey: The full path to a registry key under a given ROOT key.\n\n\ + Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n\n\ /s\n\ - Copy all subkeys and values from <key1> to <key2>.\n\n\ + 從 <機碼1> 複製所有子機碼和值到 <機碼2>。\n\n\ /f\n\ - Overwrite all registry data in <key2> without prompting for confirmation.\n\ - This option does not modify subkeys and values that only exist in <key2>.\n\n" + 覆寫 <機碼2> 內所有的登錄資料而不需確認提示。\n\ + 這個選項不會修改只在 <機碼2> 存在的子機碼和值。\n\n" - STRING_COPY_SRC_DEST_SAME, "reg: The source and destination keys cannot be the same\n" - STRING_COPY_CONFIRM, "The value '%1\\%2' already exists in the destination key. Do you want to overwrite it?" + STRING_COPY_SRC_DEST_SAME, "reg: 來源和目標機碼不可以相同\n" + STRING_COPY_CONFIRM, "目標機碼內的值 '%1\\%2' 已經存在。您要覆寫它嗎?" } diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc index 45282e2de7d..7c3dabd3761 100644 --- a/base/system/diskpart/diskpart_msg.mc +++ b/base/system/diskpart/diskpart_msg.mc @@ -245,26 +245,24 @@ Example: ACTIVE . Language=Taiwanese - On disks with master boot record (MBR) disk formatting, marks - the partition with focus as active. + 在具有主開機記錄 (MBR) 磁碟格式的磁碟上， + 將已選擇的磁碟分割標示為使用中。 -Syntax: ACTIVE +語法: ACTIVE - Writes a value to the disk which is read by the basic input/output - system (BIOS) at boot. This value specifies that the partition is - a valid system partition. + 寫入值到磁碟，而該磁碟會在開機時由基本輸入/輸出系統 (BIOS) 讀取。 + 這個值會指定磁碟分割為有效的系統磁碟分割。 - A partition must be selected for this operation to succeed. + 您必須先選擇磁碟分割，才能完成這個操作。 - Caution: + 注意: - DiskPart verifies only that the partition is capable of containing the - operating system startup files. DiskPart does not check the contents of - the partition. If you mistakenly mark a partition as active and it does - not contain the operating system startup files, your computer might not - start. + DiskPart 只會檢查該磁碟分割是否可以包含作業系統的啟動檔案。 + DiskPart 不會檢查該磁碟分割的內容。 + 如果您錯誤地將未包含作業系統的啟動檔案的磁碟分割標示為使用中， + 您的電腦可能會無法啟動。 -Example: +範例: ACTIVE . @@ -683,23 +681,21 @@ Example: CLEAN . Language=Taiwanese - Removes any and all partition or volume formatting from the disk with - focus. + 從已選擇的磁碟上移除所有磁碟分割或磁碟區格式。 -Syntax: CLEAN [ALL] +語法: CLEAN [ALL] - ALL Specifies that each and every byte\sector on the disk is set to - zero, which completely deletes all data contained on the disk. + ALL 指定將磁碟上每個位元組/磁區設定為零， + 即完全刪除磁碟上包含的所有資料。 - On master boot record (MBR) disks, only the MBR partitioning information - and hidden sector information are overwritten. On GUID partition table - (GPT) disks, the GPT partitioning information, including the Protective - MBR, is overwritten. If the ALL parameter is not used, the first 1MB - and the last 1MB of the disk are zeroed. This erases any disk formatting - that had been previously applied to the disk. The disk's state after - cleaning the disk is 'UNINITIALIZED'. + 在主開機記錄 (MBR) 磁碟上，只會覆寫 MBR 磁碟分割資訊和隱藏的磁區資訊。 + 在 GUID 磁碟分割表格 (GPT) 磁碟上，會覆寫 GPT 磁碟分割資訊， + 包括保護性 MBR。 + 如果沒有使用 ALL 參數，會將磁碟的最前 1MB 和最後 1MB 設定為零。 + 這會清除先前套用到該磁碟的任何磁碟格式。 + 清除磁碟以後，磁碟狀態會變為 '未初始化'。 -Example: +範例: CLEAN . @@ -1158,39 +1154,34 @@ Example: CREATE PARTITION EXTENDED SIZE=1000 . Language=Taiwanese - Creates an extended partition on the disk with focus. - Applies to master boot record (MBR) disks only. + 在已選擇的磁碟上建立一個延伸磁碟分割。 + 只適用於主開機記錄 (MBR) 磁碟。 -Syntax: CREATE PARTITION EXTENDED [SIZE=<N>] [OFFSET=<N>] [ALIGN=<N>] [NOERR] +語法: CREATE PARTITION EXTENDED [SIZE=<N>] [OFFSET=<N>] [ALIGN=<N>] [NOERR] - SIZE=<N> The size of the partition in megabytes (MB). If no size is - given, the partition continues until there is no more free - space in the extended partition. + SIZE=<N> 磁碟分割大小 (單位為 MB)。如果沒有提供大小， + 磁碟分割會繼續，直至目前區域沒有任何可用空間。 - OFFSET=<N> The offset, in kilobytes (KB), at which the partition is - created. If no offset is given, the partition will start - at the beginning of the first free space on the disk that - is large enough to hold the new partition. + OFFSET=<N> 建立磁碟分割所在的位移 (單位為 KB)。如果沒有指定位移， + 磁碟分割會從磁碟上可容納新磁碟分割的 + 第一個可用空間的開頭開始。 - ALIGN=<N> Typically used with hardware RAID Logical Unit Number (LUN) - arrays to improve performance. The partition offset will be - a multiple of <N>. If the OFFSET parameter is specified, it - will be rounded to the closest multiple of <N>. + ALIGN=<N> 通常與硬體 RAID 邏輯單元編號 (LUN) 陣列搭配使用以增進效能。 + 延伸位移將會是 <N> 的倍數。如果指定了 OFFSET 參數， + 它會取至最接近的 <N> 的倍數。 - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. + NOERR 只限指令碼。當發生錯誤時，DiskPart 會繼續處理命令， + 如同沒有發生任何錯誤一樣。如果沒有使用 NOERR 參數， + 錯誤會導致 DiskPart 結束，並傳回錯誤碼。 - After the partition has been created, the focus automatically shifts to the - new partition. Only one extended partition can be created per disk. This - command fails if you attempt to create an extended partition within another - extended partition. You must create an extended partition before you can - create logical partitions. + 在磁碟分割建立完成後，焦點將自動給予新磁碟分割。 + 每個磁碟只能建立一個延伸磁碟分割。如果您嘗試在一個延伸磁碟分割中 + 建立另一個延伸磁碟分割，命令將會執行失敗。 + 您必須先建立一個延伸磁碟分割，然後才能建立邏輯磁碟分割。 - A basic MBR disk must be selected for this operation to succeed. + 您必須先選擇基本 MBR 磁碟，才能完成這個操作。 -Example: +範例: CREATE PARTITION EXTENDED SIZE=1000 . @@ -1529,38 +1520,33 @@ Example: CREATE PARTITION LOGICAL SIZE=1000 . Language=Taiwanese - Creates a logical partition in an extended partition. - Applies to master boot record (MBR) disks only. + 在延伸磁碟分割內建立一個邏輯磁碟分割。 + 只適用於主開機記錄 (MBR) 磁碟。 -Syntax: CREATE PARTITION LOGICAL [SIZE=<N>] [OFFSET=<N>] [ALIGN=<N>] [NOERR] +語法: CREATE PARTITION LOGICAL [SIZE=<N>] [OFFSET=<N>] [ALIGN=<N>] [NOERR] - SIZE=<N> The size of the partition in megabytes (MB). The partition is - at least as big in bytes as the number specified by N. If you - specify a size for the logical partition, it must be smaller - than the extended partition. If no size is given, the partition - continues until there is no more free space in the extended - partition. + SIZE=<N> 磁碟分割大小 (單位為 MB)。磁碟分割的大小至少為 N 所指定的 + 大小 (位元組)。如果您指定邏輯磁碟分割的大小，它必須小於 + 延伸磁碟分割。如果沒有提供大小，磁碟分割會繼續， + 直至延伸磁碟分割沒有任何可用空間。 - OFFSET=<N> The offset, in kilobytes (KB), at which the partition is created. - If no offset is given, the partition is placed in the first disk - extent that is large enough to hold it. + OFFSET=<N> 建立磁碟分割所在的位移 (單位為 KB)。如果沒有指定位移， + 磁碟分割會從磁碟上可容納新磁碟分割的 + 第一個可用空間的開頭開始。 - ALIGN=<N> Typically used with hardware RAID Logical Unit Number (LUN) - arrays to improve performance. The partition offset will be - a multiple of <N>. If the OFFSET parameter is specified, it - will be rounded to the closest multiple of <N>. + ALIGN=<N> 通常與硬體 RAID 邏輯單元編號 (LUN) 陣列搭配使用以增進效能。 + 延伸位移將會是 <N> 的倍數。如果指定了 OFFSET 參數， + 它會取至最接近的 <N> 的倍數。 - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. + NOERR 只限指令碼。當發生錯誤時，DiskPart 會繼續處理命令， + 如同沒有發生任何錯誤一樣。如果沒有使用 NOERR 參數， + 錯誤會導致 DiskPart 結束，並傳回錯誤碼。 - After the partition has been created, the focus automatically shifts to the - new logical partition. + 在磁碟分割建立完成後，焦點將自動給予新的邏輯磁碟分割。 - A basic MBR disk must be selected for this operation to succeed. + 您必須先選擇基本 MBR 磁碟，才能完成這個操作。 -Example: +範例: CREATE PARTITION LOGICAL SIZE=1000 . @@ -2570,105 +2556,98 @@ Example: CREATE PARTITION PRIMARY SIZE=10000 ID=DE . Language=Taiwanese - Creates a primary partition on the basic disk with focus. + 在已選擇的基本磁碟上建立主要磁碟分割。 -Syntax: CREATE PARTITION PRIMARY [SIZE=<N>] [OFFSET=<N>] [ID={<BYTE> | <GUID>}] +語法: CREATE PARTITION PRIMARY [SIZE=<N>] [OFFSET=<N>] [ID={<BYTE> | <GUID>}] [ALIGN=<N>] [NOERR] - SIZE=<N> The size of the partition in megabytes (MB). If no size is - given, the partition continues until there is no more - unallocated space in the current region. + SIZE=<N> 磁碟分割大小 (單位為 MB)。如果沒有提供大小，磁碟分割會繼續， + 直至目前區域沒有任何可用空間。 - OFFSET=<N> The offset, in kilobytes (KB), at which the partition is created. - If no offset is given, the partition is placed in the first disk - extent that is large enough to hold it. + OFFSET=<N> 建立磁碟分割所在的位移 (單位為 KB)。如果沒有指定位移， + 磁碟分割會從磁碟上可容納新磁碟分割的 + 第一個可用空間的開頭開始。 ID={<BYTE> | <GUID>} - Specifies the partition type. + 指定磁碟分割類型。 - Intended for Original Equipment Manufacturer (OEM) use only. + 只供原始設備製造商 (OEM) 使用。 - For master boot record (MBR) disks, you can specify a partition - type byte, in hexadecimal form, for the partition. If this - parameter is not specified for an MBR disk, the command creates - a partition of type 0x06 (specifies no file system is installed). + 對於主開機記錄 (MBR) 磁碟，您可以使用十六進位格式來指定該 + 磁碟分割的磁碟分割類型位元組。如果沒有為 MBR 磁碟指定 + 這個參數，這個命令會建立類型為 06 的磁碟分割。 + (指定沒有安裝檔案系統)。 - LDM data partition: + LDM 資料磁碟分割: 0x42 - Recovery partition: + 修復磁碟分割: 0x27 - Recognized OEM Ids: + 可識別的 OEM 識別碼: 0x12 0x84 0xDE 0xFE 0xA0 - For GUID partition table (GPT) disks you can specify a - partition type GUID for the partition you want to create. - Recognized GUIDs include: + 對於 GUID 磁碟分割表格 (GPT) 磁碟，您可以為想要建立的 + 磁碟分割指定磁碟分割類型 GUID。 + 可識別的 GUID 包括: - EFI System partition: + EFI 系統磁碟分割: c12a7328-f81f-11d2-ba4b-00a0c93ec93b - Microsoft Reserved partition: + Microsoft 保留磁碟分割: e3c9e316-0b5c-4db8-817d-f92df00215ae - Basic data partition: + 基本資料磁碟分割: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 - LDM Metadata partition on a dynamic disk: + 動態磁碟上的 LDM 中繼資料磁碟分割: 5808c8aa-7e8f-42e0-85d2-e1e90434cfb3 - LDM Data partition on a dynamic disk: + 動態磁碟上的 LDM 資料磁碟分割: af9b60a0-1431-4f62-bc68-3311714a69ad - Recovery partition: + 修復磁碟分割: de94bba4-06d1-4d40-a16a-bfd50179d6ac - If this parameter is not specified for a GPT disk, the command - creates a basic data partition. + 如果沒有為 GPT 磁碟指定這個參數， + 這個命令會建立基本資料磁碟分割。 - Any partition type byte or GUID can be specified with this - parameter. DiskPart does not check the partition type for - validity except to ensure that it is a byte in hexadecimal form - or a GUID. + 您可以使用這個參數指定任何磁碟分割類型位元組或 GUID。 + DiskPart 不會檢查磁碟分割類型的有效性，但會確保 + 磁碟分割類型是否為以十六進位格式或 GUID 表示的位元組。 - Caution: + 注意: - Creating partitions with this parameter might cause your - computer to fail or be unable to start up. Unless you are - an OEM or an IT professional experienced with GPT disks, do - not create partitions on GPT disks using this parameter. - Instead, always use the CREATE PARTITION EFI command to - create EFI System partitions, the CREATE PARTITION MSR - command to create Microsoft Reserved partitions, and the - CREATE PARTITION PRIMARY command without this parameter to - create primary partitions on GPT disks. + 使用這個參數建立磁碟分割，可能會造成您的電腦失敗或 + 無法啟動。除非您是熟悉 GPT 磁碟的 OEM 或 IT 專業人員， + 否則請勿在 GPT 磁碟上建立磁碟分割時使用這個參數。 + 相反地，您應該使用 CREATE PARTITION EFI 命令來建立 + EFI 系統磁碟分割、使用 CREATE PARTITION MSR 命令來建立 + Microsoft 保留磁碟分割，及使用 CREATE PARTITION PRIMARY + 命令 (而不使用此參數) 在 GPT 磁碟上建立主要磁碟分割。 - ALIGN=<N> Typically used with hardware RAID Logical Unit Number (LUN) - arrays to improve performance. The partition offset will be - a multiple of <N>. If the OFFSET parameter is specified, it - will be rounded to the closest multiple of <N>. + ALIGN=<N> 通常與硬體 RAID 邏輯單元編號 (LUN) 陣列搭配使用以增進效能。 + 延伸位移將會是 <N> 的倍數。如果指定了 OFFSET 參數， + 它會取至最接近的 <N> 的倍數。 - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. + NOERR 只限指令碼。當發生錯誤時，DiskPart 會繼續處理命令， + 如同沒有發生任何錯誤一樣。如果沒有使用 NOERR 參數， + 錯誤會導致 DiskPart 結束，並傳回錯誤碼。 - After you create the partition, the focus automatically shifts to the new - partition. The partition does not receive a drive letter. You must use the - assign command to assign a drive letter to the partition. + 在磁碟分割建立完成後，焦點將自動給予新的磁碟分割。該磁碟分割尚未指定 + 磁碟機代號。您必須使用 ASSIGN 命令來分配磁碟機代號到該磁碟分割。 - A basic disk must be selected for this operation to succeed. + 您必須先選擇基本磁碟，才能完成這個操作。 - If a partition type is not specified, the disk is uninitialized and disk - size is greater than 2TB, it will be initialized to GPT. + 如果未有指定磁碟分割類型，而磁碟尚未初始化且磁碟大小大於 2TB， + 磁碟將會初始化為 GPT 磁碟。 -Example: +範例: CREATE PARTITION PRIMARY SIZE=1000 CREATE PARTITION PRIMARY SIZE=128 ID=c12a7328-f81f-11d2-ba4b-00a0c93ec93b @@ -2954,28 +2933,25 @@ Example: DELETE PARTITION . Language=Taiwanese -Deletes the partition with focus. +刪除已選擇的磁碟分割。 -Syntax: DELETE PARTITION [NOERR] [OVERRIDE] +語法: DELETE PARTITION [NOERR] [OVERRIDE] - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. + NOERR 只限指令碼。當發生錯誤時，DiskPart 會繼續處理命令， + 如同沒有發生任何錯誤一樣。如果沒有使用 NOERR 參數， + 錯誤會導致 DiskPart 結束，並傳回錯誤碼。 - OVERRIDE Enables DiskPart to delete any partition regardless of type. - Typically, DiskPart only permits you to delete known data - partitions. + OVERRIDE 讓 DiskPart 刪除所有類型的磁碟分割。 + 一般來說，DiskPart 只允許您刪除已知的資料磁碟分割。 - You cannot delete the system partition, boot partition, or any partition - that contains the active paging file or crash dump (memory dump) filed. + 您不能刪除系統磁碟分割、開機磁碟分割，或任何包含使用中的 + 分頁檔或損毀傾印 (記憶體傾印) 檔案的磁碟分割。 - A partition must be selected for this operation to succeed. + 您必須先選擇一個磁碟分割，才能完成這個操作。 - Partitions cannot be deleted from dynamic disks or created on dynamic - disks. + 您無法從動態磁碟刪除磁碟分割，也無法在動態磁碟上建立磁碟分割。 -Example: +範例: DELETE PARTITION . @@ -3131,14 +3107,13 @@ Example: DETAIL DISK . Language=Taiwanese - Displays the properties of the selected disk and the list of volumes on - the disk. + 顯示在該磁碟上已選擇之磁碟的內容及列出磁碟區。 -Syntax: DETAIL DISK +語法: DETAIL DISK - A disk must be selected for this operation to succeed. + 您必須先選擇一個磁碟，才能完成這個操作。 -Example: +範例: DETAIL DISK . @@ -3248,13 +3223,13 @@ Example: DETAIL PARTITION . Language=Taiwanese - Displays the properties for the selected partition. + 顯示已選擇之磁碟分割的內容。 -Syntax: DETAIL PARTITION +語法: DETAIL PARTITION - A partition must be selected for this operation to succeed. + 您必須先選擇一個磁碟分割，才能完成這個操作。 -Example: +範例: DETAIL PARTITION . @@ -3373,14 +3348,13 @@ Example: DETAIL VOLUME . Language=Taiwanese - Displays the properties for the selected volume and the list of disks on - which the volume resides. + 顯示已選擇之磁碟區的內容，及磁碟區所在的磁碟清單。 -Syntax: DETAIL VOLUME +語法: DETAIL VOLUME - A volume must be selected for this operation to succeed. + 您必須先選擇一個磁碟區，才能完成這個操作。 -Example: +範例: DETAIL VOLUME . @@ -3508,11 +3482,11 @@ Example: EXIT . Language=Taiwanese - Exits the DiskPart command interpreter. + 結束 DiskPart 命令直譯器。 -Syntax: EXIT +語法: EXIT -Example: +範例: EXIT . @@ -3705,14 +3679,14 @@ Example: FILESYSTEMS . Language=Taiwanese - Displays information about the current file system for the selected - volume, and the supported file systems for formatting the volume. + 顯示所選取磁碟區之目前檔案系統的相關資訊， + 及可支援的檔案系統，以格式化該磁碟區。 -Syntax: FILESYSTEMS +語法: FILESYSTEMS - A volume must be selected for this operation to succeed. + 您必須先選擇一個磁碟區，才能完成這個操作。 -Example: +範例: FILESYSTEMS . @@ -4317,66 +4291,56 @@ Examples: FORMAT RECOMMENDED OVERRIDE . Language=Taiwanese - Formats the specified volume for use with ReactOS. + 格式化指定的磁碟區以供 ReactOS 使用。 -Syntax: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] +語法: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] [UNIT=<N>] [QUICK] [COMPRESS] [OVERRIDE] [DUPLICATE] [NOWAIT] [NOERR] - FS=<FS> Specifies the type of file system. If no file system is given, - the default file system displayed by the FILESYSTEMS command is - used. + FS=<FS> 指定檔案系統的類型。如果沒有提供檔案系統，則會使用 + FILESYSTEMS 命令顯示的預設檔案系統。 REVISION=<X.XX> - Specifies the file system revision (if applicable). + 指定檔案系統修訂編號 (如適用)。 - RECOMMENDED If specified, use the recommended file system and revision - instead of the default if a recommendation exists. The - recommended file system (if one exists) is displayed by the - FILESYSTEMS command. + RECOMMENDED 如果指定這個參數，請使用建議的檔案系統及修訂編號以取代 + 預設的修訂編號 (如果有建議的話)。 + FILESYSTEMS 命令可顯示建議的檔案系統 (如果有建議設定)。 LABEL=<"label"> - Specifies the volume label. + 指定磁碟區標籤。 - UNIT=<N> Overrides the default allocation unit size. Default settings - are strongly recommended for general use. The default - allocation unit size for a particular file system is displayed - by the FILESYSTEMS command. + UNIT=<N> 覆寫預設的配置單位大小。在一般使用情況下，強烈建議使用預設 + 設定。您可以使用 FILESYSTEMS 命令來顯示特定檔案系統的 + 預設配置單位大小。 - NTFS compression is not supported for allocation unit sizes - above 4096. + NTFS 壓縮不支援超過 4096 的配置單位大小。 - QUICK Performs a quick format. + QUICK 進行快速格式化。 - COMPRESS NTFS only: Files created on the new volume will be compressed - by default. + COMPRESS 只限 NTFS: 預設情況下，在新磁碟區上建立的檔案將會被壓縮。 - OVERRIDE Forces the file system to dismount first if necessary. All - opened handles to the volume would no longer be valid. + OVERRIDE 如果有必要，會強制先解下磁碟區。所有已開啟的磁碟區 + 控制代碼將會失效。 - DUPLICATE UDF Only: This flag applies to UDF format, version 2.5 or - higher. - This flag instructs the format operation to duplicate the file - system meta-data to a second set of sectors on the disk. The - duplicate meta-data is used by applications, for example repair - or recovery applications. If the primary meta-data sectors are - found to be corrupted, the file system meta-data will be read - from the duplicate sectors. + DUPLICATE 只限 UDF: 這個旗標適用於 UDF 格式 2.5 或更高版本。 + 這個旗標會指示格式化操作將檔案系統的中繼資料複製到磁碟上的 + 第二組扇區。複製的中繼資料可被應用程式使用，例如修復或恢復 + 應用程式。如果系統發現主要中繼資料扇區損壞，則會從複製扇區 + 中讀取檔案系統中繼資料。 - NOWAIT Forces the command to return immediately while the format - process is still in progress. If NOWAIT is not specified, - DiskPart will display format progress in percentage. + NOWAIT 當格式化程序仍在進行中的時候，強制該命令立刻返回。 + 如果沒有指定 NOWAIT，DiskPart 將會以百分比顯示格式化進度。 - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. + NOERR 只限指令碼。當發生錯誤時，DiskPart 會繼續處理命令， + 如同沒有發生任何錯誤一樣。如果沒有使用 NOERR 參數， + 錯誤會導致 DiskPart 結束，並傳回錯誤碼。 - A volume must be selected for this operation to succeed. + 您必須先選擇一個磁碟區，才能完成這個操作。 -Examples: +範例: FORMAT FS=NTFS LABEL="New Volume" QUICK COMPRESS FORMAT RECOMMENDED OVERRIDE @@ -4561,16 +4525,15 @@ Example: HELP CREATE PARTITION PRIMARY . Language=Taiwanese - Displays a list of the available commands or detailed help information for a - specified command. + 顯示可用的命令清單，或指定之命令的詳細說明。 -Syntax: HELP [<COMMAND>] +語法: HELP [<COMMAND>] - <COMMAND> The command for which to display detail help. + <COMMAND> 要顯示其詳細說明的命令。 - If no command is specified, HELP will display all possible commands. + 如果沒有指定命令，HELP 將會顯示所有可能的命令。 -Example: +範例: HELP HELP CREATE PARTITION PRIMARY @@ -4828,25 +4791,24 @@ Example: INACTIVE . Language=Taiwanese - On disks with master boot record (MBR) disk formatting, marks - the partition with focus as inactive. + 在具有主開機記錄 (MBR) 磁碟格式的磁碟上， + 將已選擇的磁碟分割標示為非使用中。 -Syntax: INACTIVE +語法: INACTIVE - The computer may start from the next option specified in the BIOS such as a - CD-ROM drive or a Pre-Boot eXecution Environment (PXE)-based boot - environment (such as Remote Installation Services (RIS)) when you restart - the computer. + 當您重新啟動電腦時，電腦可以從您在 BIOS 中指定的下一個選項啟動， + 例如 CD-ROM 光碟機或開機前執行環境 (PXE) 的開機環境 + (例如，遠端安裝服務\r\n (RIS))。 - A partition must be selected for this operation to succeed. + 您必須先選擇一個磁碟分割，才能完成這個操作。 - Caution: + 注意: - Your computer might not start without an active partition. Do not mark - a system or boot partition as inactive unless you are an experienced - user with a thorough understanding of ReactOS storage management. + 如果沒有使用中的磁碟分割，您的電腦將無法啟動。 + 除非您是非常熟悉 ReactOS 存放管理的進階使用者， + 否則請勿將系統或開機磁碟分割標示為非使用中。 -Example: +範例: INACTIVE . @@ -5085,27 +5047,24 @@ Example: LIST DISK . Language=Taiwanese - Displays a list of disks. + 顯示磁碟清單。 -Syntax: LIST DISK +語法: LIST DISK - Displays a list of disks and information about them, such as their - size, amount of available free space, whether the disk is a basic - or dynamic disk, and whether the disk uses the master boot record - (MBR) or GUID partition table (GPT) partition style. The disk marked - with an asterisk (*) has focus. + 顯示磁碟清單，以及它們的相關資訊，例如大小資訊、可用磁碟空間大小 + (無論該磁碟是基本磁碟或動態磁碟)，及該磁碟是使用主開機記錄 (MBR) 或 + GUID 磁碟分割表格 (GPT) 磁碟分割樣式。有標示星號 (*) 的磁碟是已選擇 + 的磁碟。 - Note that the FREE column does not display the total amount of free - space on the disk, but rather the amount of usable free space left - on the disk. For example, if you have a 10GB disk with 4 primary - partitions covering 5GB, there is no usable free space left (no - more partitions may be created). Another example would be you have - a 10GB disk with 3 primary partitions and an extended partition - covering 8GB. The exended partition is of size 3GB with one logical - drive of size 2GB. The disk will show only 1GB as free - the - 1GB of free space in the extended partition. + 請注意，可用行所標示的不是磁碟上的空間總大小，而是磁碟上剩餘的可用 + 空間大小。例如，您有一個 10GB 的磁碟，而磁碟包含了 4 個主要磁碟分割 + (共使用了 5GB)，磁碟將沒有任何可用空間 (不能建立更多磁碟分割)。 + 再例如，您有一個 10GB 的磁碟，而磁碟包含了 3 個主要磁碟分割 + 和 1 個延伸磁碟分割 (共使用了 8GB)。如該延伸磁碟分割的大小是 3GB， + 而且有 1 個 2GB 的邏輯磁碟分割。這時會顯示磁碟只有 1GB 的可用空間 + (即延伸磁碟分割內的 1GB 可用空間)。 -Example: +範例: LIST DISK . @@ -5252,17 +5211,16 @@ Example: LIST PARTITION . Language=Taiwanese - Displays a list of partitions in the partition table for the selected disk. + 顯示已選擇的磁碟之磁碟分割表格中的磁碟分割清單。 -Syntax: LIST PARTITION +語法: LIST PARTITION - On dynamic disks, the partitions do not neccessarily correspond to the - dynamic volumes on the disk. Partitions may not be created or deleted - on dynamic disks. + 在動態磁碟上，磁碟分割不一定會對應到磁碟上的動態磁碟區。 + 您無法在動態磁碟上建立或刪除磁碟分割。 - A disk must be selected for this operation to succeed. + 您必須先選擇一個磁碟，才能完成這個操作。 -Example: +範例: LIST PARTITION . @@ -5363,12 +5321,11 @@ Example: LIST VOLUME . Language=Taiwanese - Displays a list of basic and dynamic volumes which are installed on the local - machine. + 顯示已安裝在本機上的基本磁碟區與動態磁碟區清單。 -Syntax: LIST VOLUME +語法: LIST VOLUME -Example: +範例: LIST VOLUME . @@ -5730,16 +5687,15 @@ Example: ASSIGN f: . Language=Taiwanese - Provides a way to add comments to a script. + 提供將命令加入指令碼的方法。 -Syntax: REM +語法: REM -Example: +範例: - In this example script, REM is used to provide a comment about what the - script does. + 在這個範例指令碼中，REM 是用來提供關於該指令碼之功能的註解。 - REM These commands set up 3 drives. + REM 這些命令可建立 3 部磁碟機。 CREATE PARTITION PRIMARY SIZE=2048 ASSIGN d: CREATE PARTITION EXTEND @@ -5909,11 +5865,11 @@ Example: RESCAN . Language=Taiwanese - Locates new disks that may have been added to the computer. + 找出可能已加入電腦的新磁碟。 -Syntax: RESCAN +語法: RESCAN -Example: +範例: RESCAN . @@ -6370,40 +6326,36 @@ Example: SELECT DISK=PCIROOT(0)#PCI(0100)#ATA(C00T00L01) . Language=Taiwanese - Selects the specified disk and shifts the focus to it. + 選擇指定的磁碟，並將焦點轉移到該磁碟。 -Syntax: SELECT DISK=<N> - SELECT DISK=SYSTEM - SELECT DISK=NEXT - SELECT DISK=<Path> +語法: SELECT DISK=<N> + SELECT DISK=SYSTEM + SELECT DISK=NEXT + SELECT DISK=<Path> DISK=<N> - The DiskPart disk index number of the disk to receive - focus. + 要接收焦點之磁碟的磁碟號碼。 DISK=<Path> - The location path of the disk to receive focus. + 要接收焦點之磁碟的位置的路徑。 DISK=SYSTEM - On BIOS machines, BIOS disk 0 will receive focus. - On EFI machines, the disk containing the ESP partition - used for the current boot will receive focus. On EFI - machines, if there is no ESP, or there is more than - one ESP present, or the machine is booted from Windows PE, - the command will fail. + 在使用 BIOS 的電腦中，BIOS 磁碟 0 會接收焦點。 + 在使用 EFI 的電腦中，包含用於目前啟動程序的 ESP 分區的 + 磁碟會接收焦點。如果在使用 EFI 的電腦中沒有 ESP 分區、 + 有多於一個 ESP 分區，或者電腦是從 Windows PE 啟動， + 命令將會失敗。 DISK=NEXT - Once a disk is selected, this command is used to iterate - over all disks in the disk list. The next disk in the list - will receive focus. If the next disk is the start of the - enumeration, the command will fail and no disk will have - focus. + 在選擇磁碟後，這個命令是用以逐一查看磁碟清單中的 + 所有磁碟。清單中的下一個磁碟將會接收焦點。 + 如果下一個磁碟是列舉的開頭，命令將會失敗，且沒有任何 + 磁碟會有焦點。 - If no options are specified, the select command lists the disk that - currently has the focus. You can view the DiskPart index numbers - for all disks on the computer by using the LIST DISK command. + 如果未指定任何選項，Select 命令會列出目前聚焦中的磁碟。 + 您可以使用 LIST DISK 命令，檢視電腦上所有磁碟的 DiskPart 索引號碼。 -Example: +範例: SELECT DISK=1 SELECT DISK=SYSTEM @@ -6608,23 +6560,22 @@ Example: SELECT PARTITION=1 . Language=Taiwanese - Selects the specified partition and shifts the focus to it. + 選取指定的磁碟分割，並將焦點轉移到該磁碟分割。 -Syntax: SELECT PARTITION=<N> +語法: SELECT PARTITION=<N> PARTITION=<N> - The number of the partition to receive the focus. + 要接收焦點之磁碟分割的磁碟分割號碼。 - If no partition is specified, the select command lists the current - partition with focus. You can specify the partition by its number. You can - view the numbers of all partitions on the current disk by using the list - partition command. + 如果未指定任何選項，Select 命令會列出目前聚焦中的磁碟分割。 + 您可以使用磁碟分割的號碼來指定它。您可以使用 list partition 命令 + 來檢視目前磁碟上之所有磁碟分割的號碼。 - You must first select a disk using the DiskPart select disk command before - you can select a partition. + 在選擇磁碟分割之前，您必須先使用 DiskPart 的 select disk 命令 + 來選擇磁碟。 -Example: +範例: SELECT PARTITION=1 . @@ -6835,22 +6786,20 @@ Example: SELECT VOLUME=C:\\MountH . Language=Taiwanese - Selects the specified volume and shifts the focus to it. + 選取指定的磁碟區，並將焦點移到該磁碟區。 -Syntax: SELECT VOLUME={<N> | <D>} +語法: SELECT VOLUME={<N> | <D>} - VOLUME=<N> The number of the volume to receive the focus. + VOLUME=<N> 要接收焦點的磁碟區編號。 - VOLUME=<D> The drive letter or mounted folder path of the volume - to receive the focus. + VOLUME=<D> 要接收焦點的磁碟區代號或掛接點路徑。 - If no volume is specified, the select command lists the current volume with - focus. You can specify the volume by number, drive letter, or mounted folder - path. On a basic disk, selecting a volume also gives the corresponding - partition focus. You can view the numbers of all volumes on the computer by - using the list volume command. + 如果沒有指定磁碟區，select 命令將列出目前聚焦中的磁碟區。您可以根據編號、 + 磁碟機代號或掛接點路徑指定磁碟區。在基本磁碟中，選擇磁碟區同時也會給予 + 相對的磁碟分割焦點。您可以使用 list volume 命令以檢視所有電腦中磁碟區的 + 編號。 -Example: +範例: SELECT VOLUME=1 SELECT VOLUME=C @@ -7649,84 +7598,74 @@ Example: SET ID=ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 . Language=Taiwanese - Changes the partition type field for the partition with focus. + 更改已選擇的磁碟分割的磁碟分割類型欄位。 -Syntax: SET ID={<BYTE> | <GUID>} [OVERRIDE] [NOERR] +語法: SET ID={<BYTE> | <GUID>} [OVERRIDE] [NOERR] ID={<BYTE> | <GUID>} - Specifies the new partition type. - For master boot record (MBR) disks, you can specify a partition - type byte, in hexadecimal form, for the partition. Any - partition type byte can be specified with this parameter except - for type 0x42 (LDM partition). Note that the leading '0x' is - omitted when specifying the hexadecimal partition type. + 指定新磁碟分割類型。 + 對於主開機記錄 (MBR) 磁碟，您可以使用十六進位格式指定該磁碟分割 + 的磁碟分割類型位元組。您可以使用此參數指定任何磁碟分割類型位元組， + 但類型 42 (LDM 磁碟分割) 除外。 + 請注意，在指定十六進位格式的磁碟分割類型會略過開頭的 '0x'。 - For GUID partition table (GPT) disks you can specify a - partition type GUID for the partition. Recognized GUIDs - include: + 對於 GUID 磁碟分割表格 (GPT) 磁碟，您可以為想要建立的磁碟分割 + 指定磁碟分割類型 GUID。可識別的 GUID 包括: - EFI System partition: + EFI 系統磁碟分割: c12a7328-f81f-11d2-ba4b-00a0c93ec93b - Basic data partition: + 基本資料磁碟分割: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 - Any partition type GUID can be specified with this parameter - except for the following: + 您可以使用這個參數指定任何磁碟分割類型 GUID， + 但下列磁碟分割類型除外: - Microsoft Reserved partition: + Microsoft 保留磁碟分割: e3c9e316-0b5c-4db8-817d-f92df00215a - LDM Metadata partition on a dynamic disk: + 動態磁碟上的 LDM 中繼資料磁碟分割: 5808c8aa-7e8f-42e0-85d2-e1e90434cfb3 - LDM Data partition on a dynamic disk: + 動態磁碟上的 LDM 資料磁碟分割: af9b60a0-1431-4f62-bc68-3311714a69ad - Cluster Metadata partition: + 叢集中繼資料磁碟分割: db97dba9-0840-4bae-97f0-ffb9a327c7e1 - Other than the limitations mentioned, DiskPart otherwise does - not check the partition type for validity except to ensure that - it is a byte in hexadecimal form or a GUID. + 除了上述限制之外，DiskPart 不會檢查磁碟分割類型的有效性， + 但會確保磁碟分割類型是否為以十六進位格式或 GUID 表示的位元組。 - OVERRIDE Enables DiskPart to force the file system on the volume to - dismount before changing the partition type. When changing - the partition type, DiskPart will attempt to lock and dismount - the file system on the volume. If this parameter is not specified, - and the call to lock the file system fails, (because some other - application has an open handle to the volume), the entire - operation will fail. When this parameter is specified, the - dismount is forced even if the call to lock the file system - fails. When a file system is dismounted, all opened handles to - the volume will become invalid. + OVERRIDE 讓 DiskPart 在更改磁碟分割類型之前先強制卸載磁碟區上的檔案系統。 + 更改磁碟分割類型時，DiskPart 會嘗試鎖定並卸載磁碟區上的檔案系統。 + 若未指定這個參數，而且鎖定檔案系統的呼叫失敗 (因為某些其他 + 應用程式擁有磁碟區的已開啟控制代碼)，整個操作將會失敗。 + 指定這個參數時，即使鎖定檔案系統的呼叫失敗，仍會強制執行卸載。 + 卸載檔案系統之後，磁碟區的所有已開啟控制代碼會變為無效。 - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. + NOERR 只限指令碼。當發生錯誤時，DiskPart 會繼續處理命令， + 如同沒有發生任何錯誤一樣。如果沒有使用 NOERR 參數， + 錯誤會導致 DiskPart 結束，並傳回錯誤碼。 - Intended for Original Equipment Manufacturer (OEM) use only. + 預期只供原始設備製造商 (OEM) 使用。 - A partition must be selected for this operation to succeed. + 您必須先選擇磁碟分割，才能完成這個操作。 - Caution: + 注意: - Changing partition type fields with this parameter might cause your - computer to fail or be unable to start up. Unless you are an OEM or an - IT professional experienced with GPT disks, do not change partition - type fields on GPT disks using this parameter. Instead, always use the - CREATE PARTITION EFI command to create EFI System partitions, the - CREATE PARTITION MSR command to create Microsoft Reserved partitions, - and the CREATE PARTITION PRIMARY command without the ID parameter to - create primary partitions on GPT disks. + 使用這個參數更改磁碟分割類型欄位，可能會造成您的電腦失敗或無法啟動。 + 除非您是熟悉 GPT 磁碟的 OEM 或 IT 專業人員，否則請勿在 GPT 磁碟上 + 更改磁碟分割類型欄位時使用這個參數。相反地，您應該使用 + CREATE PARTITION EFI 命令來建立 EFI 系統磁碟分割、使用 + CREATE PARTITION MSR 命令來建立 Microsoft 保留磁碟分割，及使用 + CREATE PARTITION PRIMARY 命令 (不使用 ID 參數) 在 GPT 磁碟上 + 建立主要磁碟分割。 - This command does not work on dynamic disks nor on Microsoft Reserved - partitions. + 這個命令不適用於動態磁碟或 Microsoft 保留磁碟分割。 -Example: +範例: SET ID=07 OVERRIDE SET ID=ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 . @@ -8020,27 +7959,26 @@ Example: UNIQUEID DISK ID=baf784e7-6bbd-4cfb-aaac-e86c96e166ee . Language=Taiwanese - Displays or sets the GUID partition table (GPT) identifier or master boot - record (MBR) signature for the disk with focus. + 顯示或設定焦點所在磁碟的 GUID 磁碟分割表格 (GPT) 識別碼 + 或主開機記錄 (MBR) 簽章。 -Syntax: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] +語法: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] ID={<DWORD> | <GUID>} - For MBR disks, you can specify a four-byte (DWORD) value in - hexadecimal form for the signature. + 在主開機記錄 (MBR) 磁碟上，您可以對簽章指定十六進位形式的 + 四位元組 (DWORD) 值。 - For GPT disks, specify a GUID for the identifier. + 在 GUID 磁碟分割表格 (GPT) 磁碟上，指定識別元的 GUID。 - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. + NOERR 只限指令碼。當發生錯誤時，DiskPart 會繼續處理命令， + 如同沒有發生任何錯誤一樣。如果沒有使用 NOERR 參數， + 錯誤會導致 DiskPart 結束，並傳回錯誤碼。 - A disk must be selected for this operation to succeed. This command works - on basic and dynamic disks. + 您必須先選擇一個磁碟，才能完成這個操作。這個命令適用於基本磁碟及 + 動態磁碟。 -Example: +範例: UNIQUEID DISK UNIQUEID DISK ID=5f1b2c36 diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index f0031305c8a..b0078872817 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -1,5 +1,11 @@ -/* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ -/* Translation improved by Chan Chilung 2020 - 2021 (eason066(a)gmail.com) */ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Chinese (Traditional) resource file + * TRANSLATORS: Copyright 2016 Henry Tang Ih <henrytang2(a)hotmail.com> + * Copyright 2018 Luke Luo <njlyf2011(a)hotmail.com> + * Copyright 2020-2022 Chan Chilung <eason066(a)gmail.com> + */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -10,72 +16,72 @@ BEGIN IDS_APP_USAGE "\n磁碟分區實用工具\n\n\ Usage: DISKPART [/S 檔名] [/T 逾時] [/?]\n\n\ /S <檔名>\t執行指定的指令碼。\n\ -/T <逾時>\t逾時秒數，防止 DiskPart 使用重疊。\n\ -/?\t\t顯示此說明訊息。\n\n" +/T <逾時>\t逾時秒數，防止 DiskPart 在使用時發生交疊。\n\ +/?\t\t顯示這個說明訊息。\n\n" IDS_APP_LICENSE "根據 GNU GPLv2 許可\n" IDS_APP_CURR_COMPUTER "在電腦: %s\n\n" - IDS_APP_LEAVING "\n正在退出 DiskPart ...\n" + IDS_APP_LEAVING "\n正在退出 DiskPart...\n" IDS_APP_PROMPT "DISKPART> " END STRINGTABLE BEGIN - IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n" - IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n" - IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n" + IDS_ACTIVE_FAIL "\nDiskPart 無法把標記磁碟分割為使用中。\n請確認磁碟分割是有效的。\n" + IDS_ACTIVE_SUCCESS "\nDiskPart 已標記磁碟分割為使用中。\n" + IDS_ACTIVE_ALREADY "\n目前的磁碟分割已經標記為使用中。\n" END STRINGTABLE BEGIN - IDS_CLEAN_FAIL "\nDiskPart was unable to clean the disk.\nThe data on this disk may be unrecoverable.\n" - IDS_CLEAN_SUCCESS "\nDiskPart succeeded in cleaning the disk.\n" - IDS_CLEAN_SYSTEM "\nThe selected disk is neccessary to the operation of your computer, and may not be cleaned.\n" + IDS_CLEAN_FAIL "\nDiskPart 無法清理磁碟。\n這個磁碟上的資料可能是無法恢復的。\n" + IDS_CLEAN_SUCCESS "\nDiskPart 成功清理磁碟。\n" + IDS_CLEAN_SYSTEM "\n已選擇的磁碟是您的電腦操作所必要的，所以無法清理。\n" END STRINGTABLE BEGIN - IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" - IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n" + IDS_CREATE_PARTITION_FAIL "\nDiskPart 無法建立指定的磁碟分割。\n" + IDS_CREATE_PARTITION_SUCCESS "\nDiskPart 成功建立指定的磁碟分割。\n" END STRINGTABLE BEGIN - IDS_DELETE_PARTITION_FAIL "\nDiskPart failed to delete the selected partition.\nPlease make sure the selected partition is valid to delete.\n" - IDS_DELETE_PARTITION_SUCCESS "\nDiskPart successfully deleted the selected partition.\n" + IDS_DELETE_PARTITION_FAIL "\nDiskPart 無法刪除指定的磁碟分割。\n請確認已選擇的磁碟分割能夠正確地刪除。\n" + IDS_DELETE_PARTITION_SUCCESS "\nDiskPart 成功刪除指定的磁碟分割。\n" END /* Disk Information Labels */ STRINGTABLE BEGIN - IDS_DETAIL_INFO_DISK_ID "Disk ID: %08lx\n" + IDS_DETAIL_INFO_DISK_ID "磁碟識別碼: %08lx\n" IDS_DETAIL_INFO_TYPE "類型" IDS_DETAIL_INFO_STATUS "狀態" - IDS_DETAIL_INFO_PATH "Path : %hu\n" - IDS_DETAIL_INFO_TARGET "Target : %hu\n" - IDS_DETAIL_INFO_LUN_ID "Lun ID : %hu\n" + IDS_DETAIL_INFO_PATH "路徑 : %hu\n" + IDS_DETAIL_INFO_TARGET "目標 : %hu\n" + IDS_DETAIL_INFO_LUN_ID "Lun 識別碼: %hu\n" IDS_DETAIL_INFO_LOC_PATH "位置路徑" - IDS_DETAIL_INFO_CURR_RO_STATE "當前的唯讀狀態" + IDS_DETAIL_INFO_CURR_RO_STATE "目前的唯讀狀態" IDS_DETAIL_INFO_RO "唯讀模式" IDS_DETAIL_INFO_BOOT_DSK "啟動磁碟" IDS_DETAIL_INFO_PAGE_FILE_DSK "頁面檔案磁碟" IDS_DETAIL_INFO_HIBER_FILE_DSK "休眠檔案磁碟" IDS_DETAIL_INFO_CRASH_DSK "損毀傾印磁碟" IDS_DETAIL_INFO_CLST_DSK "叢集磁碟" - IDS_DETAIL_PARTITION_NUMBER "Partition %lu\n" - IDS_DETAIL_PARTITION_TYPE "Type : %02x\n" - IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" - IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" - IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" - IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" - IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" + IDS_DETAIL_PARTITION_NUMBER "磁碟分割 %lu\n" + IDS_DETAIL_PARTITION_TYPE "類型 : %02x\n" + IDS_DETAIL_PARTITION_HIDDEN "已隱藏 : %s\n" + IDS_DETAIL_PARTITION_ACTIVE "使用中 : %s\n" + IDS_DETAIL_PARTITION_OFFSET "位移 (位元組) : %I64u\n" + IDS_DETAIL_NO_DISKS "\n沒有磁碟附加到這個磁碟區。\n" + IDS_DETAIL_NO_VOLUME "\n沒有磁碟區與這個磁碟分割有關聯。\n" END STRINGTABLE BEGIN - IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" - IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" - IDS_FILESYSTEMS_TYPE "Type : %s\n" - IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: %lu\n" + IDS_FILESYSTEMS_CURRENT "目前的檔案系統\n" + IDS_FILESYSTEMS_FORMATTING "可用於格式化的檔案系統\n" + IDS_FILESYSTEMS_TYPE "類型 : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "叢集大小: %lu\n" END STRINGTABLE @@ -85,9 +91,9 @@ END STRINGTABLE BEGIN - IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n" - IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n" - IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n" + IDS_INACTIVE_FAIL "\nDiskPart 無法把磁碟分割標記為非使用中。\n請確認磁碟分割是有效的。\n" + IDS_INACTIVE_SUCCESS "\nDiskPart 已標記磁碟分割為非使用中。\n" + IDS_INACTIVE_ALREADY "\n目前的磁碟分割已經標記為非使用中。\n" END /* Detail header titles */ @@ -100,9 +106,9 @@ BEGIN IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c 磁碟分割 %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\n沒有可列出分區的磁碟。\n請選擇一個磁碟，再試一次。\n\n" - IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" + IDS_LIST_VOLUME_HEAD " 磁碟區 ### Ltr 標籤 FS 類型大小狀態資訊\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c 磁碟區 %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END /* RESCAN command string */ @@ -116,23 +122,23 @@ END STRINGTABLE BEGIN IDS_SELECT_NO_DISK "\n目前沒有選擇磁碟。\n請選擇一個磁碟，然後再試一次。\n\n" - IDS_SELECT_DISK "\n磁碟 %lu 現在是所選的磁碟。\n\n" + IDS_SELECT_DISK "\n磁碟 %lu 現在是所選擇的磁碟。\n\n" IDS_SELECT_DISK_INVALID "\n無效的磁碟。\n\n" IDS_SELECT_NO_PARTITION "\n目前選擇的磁碟沒有磁碟分割。\n請選擇一個磁碟，然後再試一次。\n\n" - IDS_SELECT_PARTITION "\n磁碟分割 %lu 現在是所選的磁碟分割。\n\n" + IDS_SELECT_PARTITION "\n磁碟分割 %lu 現在是所選擇的磁碟分割。\n\n" IDS_SELECT_PARTITION_NO_DISK "\n沒有選擇要設定磁碟分割的磁碟。\n請選擇一個磁碟，然後再試一次。\n\n" IDS_SELECT_PARTITION_INVALID "\n無效的磁碟分割。\n\n" IDS_SELECT_NO_VOLUME "\n目前沒有選擇磁碟區。\n請選擇一個磁碟，然後再試一次。\n\n" - IDS_SELECT_VOLUME "\n磁碟區 %lu 現在是所選的磁碟區。\n\n" - IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" + IDS_SELECT_VOLUME "\n磁碟區 %lu 現在是所選擇的磁碟區。\n\n" + IDS_SELECT_VOLUME_INVALID "\n無效的磁碟區。\n\n" END STRINGTABLE BEGIN - IDS_SETID_FAIL "\nDiskPart was unable to change the partition type.\n" - IDS_SETID_SUCCESS "\nThe partition type was changed successfully.\n" - IDS_SETID_INVALID_FORMAT "\nThe format of the partition type is invalid.\n" - IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n" + IDS_SETID_FAIL "\nDiskPart 無法更改磁碟類型。\n" + IDS_SETID_SUCCESS "\n成功更改磁碟類型。\n" + IDS_SETID_INVALID_FORMAT "\n磁碟類型的格式是無效的。\n" + IDS_SETID_INVALID_TYPE "\n無效的磁碟類型。\n" END /* Disk Status */ @@ -151,90 +157,90 @@ END /* CMD Messages for commands */ STRINGTABLE BEGIN - IDS_MSG_ARG_SYNTAX_ERROR "為此命令指定的參數是無效的。\n有關命令類型的詳細資訊:" + IDS_MSG_ARG_SYNTAX_ERROR "您為這個命令指定的引數是無效的。\n有關命令類型的詳細資訊:" END /* Help Command Descripions */ STRINGTABLE BEGIN - IDS_HELP_ACTIVE "所選將磁碟分割標記為活動。\n" - IDS_HELP_ADD "將映象添加到一個簡單磁碟區。\n" - IDS_HELP_ASSIGN "為所選的磁碟區分配一個代號或裝入點。\n" + IDS_HELP_ACTIVE "將所選的磁碟分割標記為使用中。\n" + IDS_HELP_ADD "新增一個鏡像到一個簡單磁碟區。\n" + IDS_HELP_ASSIGN "分配一個磁碟機代號或掛接點到所選的磁碟區。\n" IDS_HELP_ATTACH "附加的虛擬磁碟檔案。\n" IDS_HELP_ATTRIBUTES "操縱磁碟區或磁碟的屬性。\n" IDS_HELP_AUTOMOUNT "啟用和停用基本磁碟區的自動裝入。\n" IDS_HELP_BREAK "中斷一個鏡像組。\n" - IDS_HELP_CLEAN "清除配置資訊或所有資訊，關閉\n 磁碟。\n" + IDS_HELP_CLEAN "清除磁碟上的設定資訊或所有資訊。\n" IDS_HELP_COMPACT "嘗試減少檔案的物理大小。\n" - IDS_HELP_CONVERT "不同的磁碟格式之間進行轉換。\n" - - IDS_HELP_CREATE "新增磁碟區、分區或虛擬磁碟。\n" - IDS_HELP_CREATE_PARTITION "Create a partition.\n" - IDS_HELP_CREATE_PARTITION_EFI "Create an EFI system partition.\n" - IDS_HELP_CREATE_PARTITION_EXTENDED "Create an extended partition.\n" - IDS_HELP_CREATE_PARTITION_LOGICAL "Create a logical drive.\n" - IDS_HELP_CREATE_PARTITION_MSR "Create an MSR partition.\n" - IDS_HELP_CREATE_PARTITION_PRIMARY "Create a primary partition.\n" - IDS_HELP_CREATE_VOLUME "Create a volume.\n" - IDS_HELP_CREATE_VDISK "Create a virtual disk file.\n" - - IDS_HELP_DELETE "刪除物件。\n" - IDS_HELP_DELETE_DISK "Delete a disk.\n" - IDS_HELP_DELETE_PARTITION "Delete a partition.\n" - IDS_HELP_DELETE_VOLUME "Delete a volume.\n" - - IDS_HELP_DETACH "分離一個虛擬磁碟檔案。\n" - - IDS_HELP_DETAIL "提供物件的詳細資訊。\n" - IDS_HELP_DETAIL_DISK "Print disk details.\n" - IDS_HELP_DETAIL_PARTITION "Print partition details.\n" - IDS_HELP_DETAIL_VOLUME "Print volume details.\n" - - IDS_HELP_EXIT "退出 DiskPart。\n" - IDS_HELP_EXPAND "擴充虛擬磁碟上的最大可用空間。\n" - IDS_HELP_EXTEND "擴展磁碟區。\n" - IDS_HELP_FILESYSTEMS "顯示磁碟區上目前及受支援的檔案系統。\n" + IDS_HELP_CONVERT "轉換不同的磁碟格式。\n" + + IDS_HELP_CREATE "建立一個磁碟區、磁碟分割或虛擬磁碟。\n" + IDS_HELP_CREATE_PARTITION "建立一個磁碟分割。\n" + IDS_HELP_CREATE_PARTITION_EFI "建立一個 EFI 系統磁碟分割。\n" + IDS_HELP_CREATE_PARTITION_EXTENDED "建立一個延伸磁碟分割。\n" + IDS_HELP_CREATE_PARTITION_LOGICAL "建立一個邏輯磁碟分割。\n" + IDS_HELP_CREATE_PARTITION_MSR "建立一個 MSR 磁碟分割。\n" + IDS_HELP_CREATE_PARTITION_PRIMARY "建立一個主要磁碟分割。\n" + IDS_HELP_CREATE_VOLUME "建立一個磁碟區。\n" + IDS_HELP_CREATE_VDISK "建立一個虛擬磁碟檔案。\n" + + IDS_HELP_DELETE "刪除一個物件。\n" + IDS_HELP_DELETE_DISK "刪除一個磁碟。\n" + IDS_HELP_DELETE_PARTITION "刪除一個磁碟分割。\n" + IDS_HELP_DELETE_VOLUME "刪除一個磁碟區。\n" + + IDS_HELP_DETACH "中斷連結虛擬磁碟檔案。\n" + + IDS_HELP_DETAIL "提供一個物件的詳細資訊。\n" + IDS_HELP_DETAIL_DISK "列印磁碟的詳細資訊。\n" + IDS_HELP_DETAIL_PARTITION "列印磁碟分割的詳細資訊。\n" + IDS_HELP_DETAIL_VOLUME "列印出磁碟區的詳細資訊。\n" + + IDS_HELP_EXIT "結束 DiskPart。\n" + IDS_HELP_EXPAND "延伸虛擬磁碟上的最大可用空間。\n" + IDS_HELP_EXTEND "延伸一個磁碟區。\n" + IDS_HELP_FILESYSTEMS "顯示磁碟區上目前及支援的檔案系統。\n" IDS_HELP_FORMAT "格式化所選的磁碟區或磁碟分割。\n" - IDS_HELP_GPT "將屬性分配給所選的 GPT 分區。\n" - IDS_HELP_HELP "顯示命令的列表。\n" - IDS_HELP_IMPORT "匯入磁碟組。\n" - IDS_HELP_INACTIVE "將所選磁碟分割標記為非活動狀態。\n" + IDS_HELP_GPT "分配屬性給所選的 GPT 磁碟分割。\n" + IDS_HELP_HELP "顯示命令列表。\n" + IDS_HELP_IMPORT "匯入磁碟群組。\n" + IDS_HELP_INACTIVE "將所選的磁碟分割標記為非使用中。\n" IDS_HELP_LIST "顯示物件的列表。\n" - IDS_HELP_LIST_DISK "List disks.\n" - IDS_HELP_LIST_PARTITION "List partitions.\n" - IDS_HELP_LIST_VOLUME "List volumes.\n" - IDS_HELP_LIST_VDISK "List virtual disk files.\n" + IDS_HELP_LIST_DISK "列出磁碟。\n" + IDS_HELP_LIST_PARTITION "列出磁碟分割。\n" + IDS_HELP_LIST_VOLUME "列出磁碟區。\n" + IDS_HELP_LIST_VDISK "列出虛擬磁碟檔案。\n" IDS_HELP_MERGE "合併子磁碟與其父系。\n" - IDS_HELP_OFFLINE "把目前標記為連線的物件設成離線。\n" - IDS_HELP_ONLINE "把目前標記為離線的物件設成連線。\n" - IDS_HELP_RECOVER "重新整理選取封裝中所有磁碟的狀態，\n 嘗試在無效封裝中的磁碟復原，並重新同步具有過時網狀\n 磁碟區或同位檢查資料的鏡像磁碟區與 RAID5 磁碟區。\n" - IDS_HELP_REM "無反應。這用來註解指令碼。\n" - IDS_HELP_REMOVE "刪除磁碟區代號或裝載點指派。\n" - IDS_HELP_REPAIR "修復失敗的成員與 RAID 5 磁碟區。\n" + IDS_HELP_OFFLINE "把目前標記為連線的物件設為離線。\n" + IDS_HELP_ONLINE "把目前標記為離線的物件設為連線。\n" + IDS_HELP_RECOVER "重新整理所選封裝中所有磁碟的狀態，\n 嘗試復原在無效封裝中的磁碟，並重新同步具有過時網狀\n 磁碟區或同位檢查資料的鏡像磁碟區和 RAID5 磁碟區。\n" + IDS_HELP_REM "不做任何事。這是用來註解指令碼。\n" + IDS_HELP_REMOVE "移除磁碟區代號或掛接點的分配。\n" + IDS_HELP_REPAIR "以失敗的成員修復 RAID 5 磁碟區。\n" IDS_HELP_RESCAN "重新掃描電腦，查找磁碟和磁碟區。\n" IDS_HELP_RETAIN "在簡單磁碟區下放置一個保存磁碟分割。\n" - IDS_HELP_SAN "顯示或設定當前引導 OS 的 SAN 策略。\n" + IDS_HELP_SAN "顯示或設定目前開機 OS 的 SAN 原則。\n" - IDS_HELP_SELECT "轉移重點到另一個物件。\n" - IDS_HELP_SELECT_DISK "Moves the focus to the disk.\n" - IDS_HELP_SELECT_PARTITION "Moves the focus to the partition.\n" - IDS_HELP_SELECT_VOLUME "Moves the focus to the volume.\n" - IDS_HELP_SELECT_VDISK "Moves the focus to the virtual disk.\n" + IDS_HELP_SELECT "轉移焦點到另一個物件。\n" + IDS_HELP_SELECT_DISK "轉移焦點到磁碟。\n" + IDS_HELP_SELECT_PARTITION "轉移焦點到磁碟分割。\n" + IDS_HELP_SELECT_VOLUME "轉移焦點到磁碟區。\n" + IDS_HELP_SELECT_VDISK "轉移焦點到虛擬磁碟。\n" - IDS_HELP_SETID "更改分區類型。\n" - IDS_HELP_SHRINK "減小所選磁碟區的大小。\n" + IDS_HELP_SETID "更改磁碟分割類型。\n" + IDS_HELP_SHRINK "縮小所選磁碟區的大小。\n" - IDS_HELP_UNIQUEID "顯示或設定 GUID 分區表 (GPT) 的標識符\n 或主開機記錄 (MBR) 磁碟的簽名。\n" - IDS_HELP_UNIQUEID_DISK "顯示或設定 GUID 分區表 (GPT) 的標識符\n 或主開機記錄 (MBR) 磁碟的簽名。\n" + IDS_HELP_UNIQUEID "顯示或設定 GUID 分割表格 (GPT) 的識別碼\n 或磁碟的主開機記錄 (MBR) 簽章。\n" + IDS_HELP_UNIQUEID_DISK "顯示或設定 GUID 分割表格 (GPT) 的識別碼\n 或磁碟的主開機記錄 (MBR) 簽章。\n" END /* Common Error Messages */ STRINGTABLE BEGIN - IDS_ERROR_MSG_NO_SCRIPT "錯誤開始的指令碼: %s\n" - IDS_ERROR_MSG_BAD_ARG "錯誤處理參數: %s\n" + IDS_ERROR_MSG_NO_SCRIPT "開啟指令碼時發生錯誤: %s\n" + IDS_ERROR_MSG_BAD_ARG "處理引數時發生錯誤: %s\n" IDS_ERROR_INVALID_ARGS "無效的參數\n" - IDS_ERROR_NO_MEDIUM "No medium in device.\n" + IDS_ERROR_NO_MEDIUM "沒有媒體在裝置中。\n" END diff --git a/dll/win32/hhctrl.ocx/lang/Zh.rc b/dll/win32/hhctrl.ocx/lang/Zh.rc index d45021a8c94..cedf748a896 100644 --- a/dll/win32/hhctrl.ocx/lang/Zh.rc +++ b/dll/win32/hhctrl.ocx/lang/Zh.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TRANSLATORS: Copyright 2008 Hongbo Ni <hongbo(a)njstar.com> - * Copyright 2021 Chan Chilung <eason066(a)gmail.com> + * Copyright 2021-2022 Chan Chilung <eason066(a)gmail.com> */ /* Chinese text is encoded in UTF-8 */ @@ -27,7 +27,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN #ifdef __REACTOS__ - IDS_DEFTITLE "HTML Help" + IDS_DEFTITLE "HTML 帮助" #endif IDS_CONTENTS "内容(&C)" IDS_INDEX "索引(&N)" @@ -97,6 +97,9 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN +#ifdef __REACTOS__ + IDS_DEFTITLE "HTML 說明" +#endif IDS_CONTENTS "內容(&C)" IDS_INDEX "索引(&N)" IDS_SEARCH "搜尋(&S)"

1 0

[reactos] 01/01: [NTUSER] Send WM_IME_SYSTEM:IMS_LOADTHREADLAYOUT at IntCreateWindow (#4606)
by Katayama Hirofumi MZ 15 Aug '22

15 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe8f80610e18179ed028a… commit fe8f80610e18179ed028a119538724e04ac64e64 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 16 08:02:49 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 16 08:02:49 2022 +0900 [NTUSER] Send WM_IME_SYSTEM:IMS_LOADTHREADLAYOUT at IntCreateWindow (#4606) - Send WM_IME_SYSTEM:IMS_LOADTHREADLAYOUT message at IntCreateWindow function. CORE-11700 --- win32ss/user/ntuser/window.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index b6a2c28bab2..a2b9e24b6d8 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2053,17 +2053,22 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, PWND pwndDefaultIme = co_IntCreateDefaultImeWindow(pWnd, pWnd->hModule); UserAssignmentLock((PVOID*)&(pti->spwndDefaultIme), pwndDefaultIme); - if (pwndDefaultIme && (pti->pClientInfo->CI_flags & CI_IMMACTIVATE)) + if (pwndDefaultIme) { + HWND hImeWnd; USER_REFERENCE_ENTRY Ref; - HKL hKL; - UserRefObjectCo(pwndDefaultIme, &Ref); - hKL = pti->KeyboardLayout->hkl; - co_IntSendMessage(UserHMGetHandle(pwndDefaultIme), WM_IME_SYSTEM, - IMS_ACTIVATELAYOUT, (LPARAM)hKL); - pti->pClientInfo->CI_flags &= ~CI_IMMACTIVATE; + hImeWnd = UserHMGetHandle(pwndDefaultIme); + + co_IntSendMessage(hImeWnd, WM_IME_SYSTEM, IMS_LOADTHREADLAYOUT, 0); + + if (pti->pClientInfo->CI_flags & CI_IMMACTIVATE) + { + HKL hKL = pti->KeyboardLayout->hkl; + co_IntSendMessage(hImeWnd, WM_IME_SYSTEM, IMS_ACTIVATELAYOUT, (LPARAM)hKL); + pti->pClientInfo->CI_flags &= ~CI_IMMACTIVATE; + } UserDerefObjectCo(pwndDefaultIme); }

1 0

[reactos] 01/01: [USER32] RealDefWindowProcA/W WM_IME_SYSTEM handling (#4607)
by Katayama Hirofumi MZ 15 Aug '22

15 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60be15ff5db10b1e54717… commit 60be15ff5db10b1e54717b6c28579fd437afdf93 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 16 08:00:47 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 16 08:00:47 2022 +0900 [USER32] RealDefWindowProcA/W WM_IME_SYSTEM handling (#4607) - Add WM_IME_SYSTEM message handling on RealDefWindowProcA and RealDefWindowProcW functions. - Improve WM_IME_... messages handling. - s/IMMGWL_IMC/IMMGWLP_IMC/ - Don't set IMMGWLP_IMC value to the default IME window. CORE-11700 --- win32ss/user/user32/misc/imm.c | 6 +-- win32ss/user/user32/windows/defwnd.c | 90 ++++++++++++++++++++---------------- 2 files changed, 53 insertions(+), 43 deletions(-) diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 2f1a1227b18..0433e3cff0c 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -331,7 +331,7 @@ static HWND User32CreateImeUIWindow(PIMEUI pimeui, HKL hKL) } if (hwndUI) - NtUserSetWindowLong(hwndUI, IMMGWL_IMC, (LONG_PTR)pimeui->hIMC, FALSE); + NtUserSetWindowLong(hwndUI, IMMGWLP_IMC, (LONG_PTR)pimeui->hIMC, FALSE); Quit: IMM_FN(ImmUnlockImeDpi)(pImeDpi); @@ -935,9 +935,8 @@ ImeWndProc_common(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicod return DefWindowProcA(hwnd, msg, wParam, lParam); } NtUserSetWindowFNID(hwnd, FNID_IME); - pimeui = HeapAlloc( GetProcessHeap(), 0, sizeof(IMEUI) ); + pimeui = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMEUI)); pimeui->spwnd = pWnd; - SetWindowLongPtrW(hwnd, IMMGWLP_IMC, (LONG_PTR)pimeui); } else { @@ -1004,7 +1003,6 @@ ImeWndProc_common(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicod case WM_NCDESTROY: HeapFree(GetProcessHeap(), 0, pimeui); - SetWindowLongPtrW(hwnd, IMMGWLP_IMC, 0); NtUserSetWindowFNID(hwnd, FNID_DESTROY); break; diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c index c6e97e5f704..688f2d48421 100644 --- a/win32ss/user/user32/windows/defwnd.c +++ b/win32ss/user/user32/windows/defwnd.c @@ -10,6 +10,7 @@ */ #include <user32.h> +#include <ddk/immdev.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); @@ -830,7 +831,6 @@ RealDefWindowProcA(HWND hWnd, switch (Msg) { case WM_NCCREATE: - { if ( Wnd && Wnd->style & (WS_HSCROLL | WS_VSCROLL) ) { @@ -854,7 +854,6 @@ RealDefWindowProcA(HWND hWnd, Result = 1; } break; - } case WM_GETTEXTLENGTH: { @@ -926,24 +925,18 @@ RealDefWindowProcA(HWND hWnd, } case WM_IME_KEYDOWN: - { Result = PostMessageA(hWnd, WM_KEYDOWN, wParam, lParam); break; - } case WM_IME_KEYUP: - { Result = PostMessageA(hWnd, WM_KEYUP, wParam, lParam); break; - } case WM_IME_CHAR: - { if (HIBYTE(wParam)) PostMessageA(hWnd, WM_CHAR, HIBYTE(wParam), lParam); PostMessageA(hWnd, WM_CHAR, LOBYTE(wParam), lParam); break; - } case WM_IME_COMPOSITION: if (lParam & GCS_RESULTSTR) @@ -987,26 +980,40 @@ RealDefWindowProcA(HWND hWnd, case WM_IME_SELECT: case WM_IME_NOTIFY: case WM_IME_CONTROL: + case WM_IME_SETCONTEXT: +NormalImeMsgHandling: { HWND hwndIME; + if (GetWin32ClientInfo()->dwTIFlags & TIF_DISABLEIME) + { + TRACE("This thread's IME is disabled\n"); + break; + } + hwndIME = IMM_FN(ImmGetDefaultIMEWnd)(hWnd); - if (hwndIME) - Result = SendMessageA(hwndIME, Msg, wParam, lParam); - break; - } + if (!hwndIME) + { + ERR("hwndIME was NULL\n"); + break; + } - case WM_IME_SETCONTEXT: - { - HWND hwndIME; + if (hwndIME == hWnd) + { + ImeWndProc_common(hwndIME, Msg, wParam, lParam, FALSE); + break; + } - hwndIME = IMM_FN(ImmGetDefaultIMEWnd)(hWnd); - if (hwndIME) - Result = SendMessageA(hwndIME, Msg, wParam, lParam); + Result = SendMessageA(hwndIME, Msg, wParam, lParam); break; } - /* fall through */ + case WM_IME_SYSTEM: + if (wParam == 4) + break; + + goto NormalImeMsgHandling; + default: Result = User32DefWindowProc(hWnd, Msg, wParam, lParam, FALSE); } @@ -1038,7 +1045,6 @@ RealDefWindowProcW(HWND hWnd, switch (Msg) { case WM_NCCREATE: - { if ( Wnd && Wnd->style & (WS_HSCROLL | WS_VSCROLL) ) { @@ -1064,7 +1070,6 @@ RealDefWindowProcW(HWND hWnd, Result = 1; } break; - } case WM_GETTEXTLENGTH: { @@ -1117,33 +1122,25 @@ RealDefWindowProcW(HWND hWnd, } case WM_SETTEXT: - { DefSetText(hWnd, (PCWSTR)lParam, FALSE); if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) UserPaintCaption(Wnd, DC_TEXT); Result = 1; break; - } case WM_IME_CHAR: - { PostMessageW(hWnd, WM_CHAR, wParam, lParam); Result = 0; break; - } case WM_IME_KEYDOWN: - { Result = PostMessageW(hWnd, WM_KEYDOWN, wParam, lParam); break; - } case WM_IME_KEYUP: - { Result = PostMessageW(hWnd, WM_KEYUP, wParam, lParam); break; - } case WM_IME_COMPOSITION: if (lParam & GCS_RESULTSTR) @@ -1172,25 +1169,40 @@ RealDefWindowProcW(HWND hWnd, case WM_IME_SELECT: case WM_IME_NOTIFY: case WM_IME_CONTROL: + case WM_IME_SETCONTEXT: +NormalImeMsgHandling: { HWND hwndIME; + if (GetWin32ClientInfo()->dwTIFlags & TIF_DISABLEIME) + { + TRACE("This thread's IME is disabled\n"); + break; + } + hwndIME = IMM_FN(ImmGetDefaultIMEWnd)(hWnd); - if (hwndIME) - Result = SendMessageW(hwndIME, Msg, wParam, lParam); - break; - } + if (!hwndIME) + { + ERR("hwndIME was NULL\n"); + break; + } - case WM_IME_SETCONTEXT: - { - HWND hwndIME; + if (hwndIME == hWnd) + { + ImeWndProc_common(hwndIME, Msg, wParam, lParam, TRUE); + break; + } - hwndIME = IMM_FN(ImmGetDefaultIMEWnd)(hWnd); - if (hwndIME) - Result = SendMessageW(hwndIME, Msg, wParam, lParam); + Result = SendMessageW(hwndIME, Msg, wParam, lParam); break; } + case WM_IME_SYSTEM: + if (wParam == 4) + break; + + goto NormalImeMsgHandling; + default: Result = User32DefWindowProc(hWnd, Msg, wParam, lParam, TRUE); }

1 0

[reactos] 01/01: [IMM32] Reduce magic numbers from CtfImmSetLangBand
by Katayama Hirofumi MZ 15 Aug '22

15 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb674f353ecfabd4f7ecb… commit eb674f353ecfabd4f7ecb365c8223fc6eb3aaea2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 15 23:00:54 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Aug 15 23:00:54 2022 +0900 [IMM32] Reduce magic numbers from CtfImmSetLangBand CORE-11700 --- dll/win32/imm32/keymsg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index e0085026136..8222be3d781 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -313,7 +313,8 @@ LRESULT APIENTRY CtfImmSetLangBand(HWND hWnd, BOOL fSet) if (pWnd->state2 & WNDS2_WMCREATEMSGPROCESSED) { - SendMessageTimeoutW(hWnd, 0x505, 0, fSet, 3, 5000, &lResult); + SendMessageTimeoutW(hWnd, WM_USER + 0x105, 0, fSet, SMTO_BLOCK | SMTO_ABORTIFHUNG, + 5000, &lResult); return lResult; }

1 0

[reactos] 01/01: [IMM32] Add 'Win:' comments more
by Katayama Hirofumi MZ 15 Aug '22

15 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9a11d1e0be180c0619d4… commit f9a11d1e0be180c0619d41ed46c89ec6862d56db Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 15 21:46:33 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Aug 15 21:46:33 2022 +0900 [IMM32] Add 'Win:' comments more CORE-11700 --- dll/win32/imm32/keymsg.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 8abd8a5c8ae..e0085026136 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -13,6 +13,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); +/* Win: CIMENonIMEToggle */ BOOL APIENTRY Imm32ImeNonImeToggle(HIMC hIMC, HKL hKL, HWND hWnd, LANGID LangID) { LPINPUTCONTEXT pIC; @@ -44,6 +45,7 @@ BOOL APIENTRY Imm32ImeNonImeToggle(HIMC hIMC, HKL hKL, HWND hWnd, LANGID LangID) return TRUE; } +/* Win: TShapeToggle */ BOOL APIENTRY Imm32CShapeToggle(HIMC hIMC, HKL hKL, HWND hWnd) { LPINPUTCONTEXT pIC; @@ -74,6 +76,7 @@ BOOL APIENTRY Imm32CShapeToggle(HIMC hIMC, HKL hKL, HWND hWnd) return TRUE; } +/* Win: CSymbolToggle */ BOOL APIENTRY Imm32CSymbolToggle(HIMC hIMC, HKL hKL, HWND hWnd) { LPINPUTCONTEXT pIC; @@ -104,6 +107,7 @@ BOOL APIENTRY Imm32CSymbolToggle(HIMC hIMC, HKL hKL, HWND hWnd) return TRUE; } +/* Win: JCloseOpen */ BOOL APIENTRY Imm32JCloseOpen(HIMC hIMC, HKL hKL, HWND hWnd) { BOOL fOpen; @@ -119,6 +123,7 @@ BOOL APIENTRY Imm32JCloseOpen(HIMC hIMC, HKL hKL, HWND hWnd) return TRUE; } +/* Win: KShapeToggle */ BOOL APIENTRY Imm32KShapeToggle(HIMC hIMC) { LPINPUTCONTEXT pIC; @@ -141,6 +146,7 @@ BOOL APIENTRY Imm32KShapeToggle(HIMC hIMC) return TRUE; } +/* Win: KHanjaConvert */ BOOL APIENTRY Imm32KHanjaConvert(HIMC hIMC) { LPINPUTCONTEXT pIC; @@ -158,6 +164,7 @@ BOOL APIENTRY Imm32KHanjaConvert(HIMC hIMC) return TRUE; } +/* Win: KEnglishHangul */ BOOL APIENTRY Imm32KEnglish(HIMC hIMC) { LPINPUTCONTEXT pIC;

1 0

[reactos] 01/01: [NTUSER] Refactor NtUserUnloadKeyboardLayout (#4605)
by Katayama Hirofumi MZ 14 Aug '22

14 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=379188acfeb55efc0dbbc… commit 379188acfeb55efc0dbbc7b5c7f3e7ecf57bbd0b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 15 08:25:06 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 15 08:25:06 2022 +0900 [NTUSER] Refactor NtUserUnloadKeyboardLayout (#4605) - Add IntHKLtoPKL, co_UserActivateKeyboardLayout, IntReorderKeyboardLayouts, and co_IntActivateKeyboardLayout helper functions. - Rewrite NtUserUnloadKeyboardLayout by using helper functions. CORE-11700 --- win32ss/include/ntuser.h | 2 +- win32ss/user/ntuser/kbdlayout.c | 183 +++++++++++++++++++++++++++++----------- 2 files changed, 135 insertions(+), 50 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 924a0bef195..3f0449d2ee6 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1515,7 +1515,7 @@ NtUserTrackPopupMenuEx( HKL NTAPI NtUserActivateKeyboardLayout( - HKL hKl, + HKL hKL, ULONG Flags); DWORD diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index 09e0f677f38..c4d97267101 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -27,7 +27,71 @@ typedef PVOID (*PFN_KBDLAYERDESCRIPTOR)(VOID); /* PRIVATE FUNCTIONS ******************************************************/ -// Win: _GetKeyboardLayoutList +/* + * Retrieves a PKL by an input locale identifier (HKL). + * @implemented + * Win: HKLtoPKL + */ +PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL) +{ + PKL pFirstKL, pKL; + + pFirstKL = pti->KeyboardLayout; + if (!pFirstKL) + return NULL; + + pKL = pFirstKL; + + /* hKL can have special value HKL_NEXT or HKL_PREV */ + if (hKL == (HKL)(ULONG_PTR)HKL_NEXT) /* Looking forward */ + { + do + { + pKL = pKL->pklNext; + if (!(pKL->dwKL_Flags & KLF_UNLOAD)) + return pKL; + } while (pKL != pFirstKL); + } + else if (hKL == (HKL)(ULONG_PTR)HKL_PREV) /* Looking backward */ + { + do + { + pKL = pKL->pklPrev; + if (!(pKL->dwKL_Flags & KLF_UNLOAD)) + return pKL; + } while (pKL != pFirstKL); + } + else if (HIWORD(hKL)) /* hKL is a full input locale identifier */ + { + /* No KLF_UNLOAD check */ + do + { + if (pKL->hkl == hKL) + return pKL; + + pKL = pKL->pklNext; + } while (pKL != pFirstKL); + } + else /* Language only specified */ + { + /* No KLF_UNLOAD check */ + do + { + if (LOWORD(pKL->hkl) == LOWORD(hKL)) /* Low word is language ID */ + return pKL; + + pKL = pKL->pklNext; + } while (pKL != pFirstKL); + } + + return NULL; +} + +/* + * A helper function for NtUserGetKeyboardLayoutList. + * @implemented + * Win: _GetKeyboardLayoutList + */ static UINT APIENTRY IntGetKeyboardLayoutList( _Inout_ PWINSTATION_OBJECT pWinSta, @@ -543,6 +607,66 @@ co_UserActivateKbl(PTHREADINFO pti, PKL pKl, UINT Flags) return pklPrev; } +/* Win: xxxInternalActivateKeyboardLayout */ +HKL APIENTRY +co_UserActivateKeyboardLayout( + _Inout_ PKL pKL, + _In_ ULONG uFlags, + _Inout_ PWND pWnd) +{ + HKL hKL = pKL->hkl; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + + if (pKL != pti->KeyboardLayout) + { + /* Activate layout for current thread */ + co_UserActivateKbl(pti, pKL, uFlags); + + /* Send shell message */ + if (!(uFlags & KLF_NOTELLSHELL)) + co_IntShellHookNotify(HSHELL_LANGUAGE, 0, (LPARAM)hKL); + } + + /* FIXME: KLF_RESET + KLF_SHIFTLOCK */ + + return hKL; +} + +// Win: ReorderKeyboardLayouts +VOID FASTCALL +IntReorderKeyboardLayouts( + _Inout_ PWINSTATION_OBJECT pWinSta, + _Inout_ PKL pKL) +{ + /* FIXME */ + gspklBaseLayout = pKL; +} + +/* Win: xxxActivateKeyboardLayout */ +HKL APIENTRY +co_IntActivateKeyboardLayout( + _Inout_ PWINSTATION_OBJECT pWinSta, + _In_ HKL hKL, + _In_ ULONG uFlags, + _Inout_ PWND pWnd) +{ + PKL pKL; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + + pKL = IntHKLtoPKL(pti, hKL); + if (!pKL) + { + ERR("Invalid HKL %p!\n", hKL); + return NULL; + } + + if (uFlags & KLF_REORDER) + IntReorderKeyboardLayouts(pWinSta, pKL); + + return co_UserActivateKeyboardLayout(pKL, uFlags, pWnd); +} + /* EXPORTS *******************************************************************/ /* @@ -821,62 +945,23 @@ cleanup: * Activates specified layout for thread or process */ HKL -APIENTRY +NTAPI NtUserActivateKeyboardLayout( - HKL hKl, + HKL hKL, ULONG Flags) { - PKL pKl = NULL; - HKL hkl = NULL; - PTHREADINFO pti; + PWINSTATION_OBJECT pWinSta; + HKL hOldKL; UserEnterExclusive(); - pti = PsGetCurrentThreadWin32Thread(); + /* FIXME */ - /* hKl can have special value HKL_NEXT or HKL_PREV */ - if (hKl == (HKL)HKL_NEXT) - { - /* Get next keyboard layout starting with current */ - if (pti->KeyboardLayout) - pKl = pti->KeyboardLayout->pklNext; - } - else if (hKl == (HKL)HKL_PREV) - { - /* Get previous keyboard layout starting with current */ - if (pti->KeyboardLayout) - pKl = pti->KeyboardLayout->pklPrev; - } - else - pKl = UserHklToKbl(hKl); - - if (!pKl) - { - ERR("Invalid HKL %p!\n", hKl); - goto cleanup; - } - - hkl = pKl->hkl; - - /* FIXME: KLF_RESET - KLF_SHIFTLOCK */ - - if (Flags & KLF_REORDER) - gspklBaseLayout = pKl; - - if (pKl != pti->KeyboardLayout) - { - /* Activate layout for current thread */ - pKl = co_UserActivateKbl(pti, pKl, Flags); - - /* Send shell message */ - if (!(Flags & KLF_NOTELLSHELL)) - co_IntShellHookNotify(HSHELL_LANGUAGE, 0, (LPARAM)hkl); - } - -cleanup: + pWinSta = IntGetProcessWindowStation(NULL); + hOldKL = co_IntActivateKeyboardLayout(pWinSta, hKL, Flags, NULL); UserLeave(); - return hkl; + + return hOldKL; } /*

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs