Ros-diffs May 2018

ros-diffs@reactos.org

23 participants
218 discussions

01/01: [MSPAINT] When clicking selection, invalidate _and_ repaint Scroll Client _and_ Image Area
by Benedikt Freisen 26 May '18

26 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cca1a3f47f3694ec57bc8… commit cca1a3f47f3694ec57bc8e2b13278749594be902 Author: Benedikt Freisen <b.freisen(a)gmx.net> AuthorDate: Sat May 26 13:23:20 2018 +0200 Commit: Benedikt Freisen <b.freisen(a)gmx.net> CommitDate: Sat May 26 14:21:07 2018 +0200 [MSPAINT] When clicking selection, invalidate _and_ repaint Scroll Client _and_ Image Area Previously, the canvas disappeared when a selection was clicked until the mouse was moved. CORE-13288 --- base/applications/mspaint/selection.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp index 9e5c689038..368c71c71f 100644 --- a/base/applications/mspaint/selection.cpp +++ b/base/applications/mspaint/selection.cpp @@ -148,6 +148,8 @@ LRESULT CSelectionWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, SetCursor(LoadCursor(NULL, m_lpszCursorLUT[m_iAction])); m_bMoving = TRUE; scrlClientWindow.InvalidateRect(NULL, TRUE); + scrlClientWindow.SendMessage(WM_PAINT, 0, 0); + imageArea.InvalidateRect(NULL, FALSE); imageArea.SendMessage(WM_PAINT, 0, 0); return 0; }

1 0

01/01: [MSPAINT] Store subsequent changes to file selected via Save As
by Benedikt Freisen 26 May '18

26 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97025c3e06cf7e1c2c768… commit 97025c3e06cf7e1c2c76875ab3f439cc305f5b40 Author: Benedikt Freisen <b.freisen(a)gmx.net> AuthorDate: Sat May 26 12:36:47 2018 +0200 Commit: Benedikt Freisen <b.freisen(a)gmx.net> CommitDate: Sat May 26 14:16:17 2018 +0200 [MSPAINT] Store subsequent changes to file selected via Save As Paint has erroneously been storing subsequent changes to Unnamed.bmp CORE-13291 --- base/applications/mspaint/winproc.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 76d7e4e67f..51ba366fe0 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -94,6 +94,7 @@ void CMainWindow::saveImage(BOOL overwrite) else if (GetSaveFileName(&sfn) != 0) { imageModel.SaveImage(sfn.lpstrFile); + _tcsncpy(filepathname, sfn.lpstrFile, SIZEOF(filepathname)); CString strTitle; strTitle.Format(IDS_WINDOWTITLE, (LPCTSTR)sfn.lpstrFileTitle); SetWindowText(strTitle);

1 0

03/03: [UBTRFS] Upgrade to 1.0.2
by Pierre Schweitzer 26 May '18

26 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de58c459fa0c6e9bcb232… commit de58c459fa0c6e9bcb2324589c5e051f3cee0318 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat May 26 11:00:51 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat May 26 11:00:51 2018 +0200 [UBTRFS] Upgrade to 1.0.2 CORE-14655 --- dll/win32/ubtrfs/ubtrfs.rc | 10 +++++----- media/doc/README.FSD | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/ubtrfs/ubtrfs.rc b/dll/win32/ubtrfs/ubtrfs.rc index cf70d78b56..e67bd27079 100644 --- a/dll/win32/ubtrfs/ubtrfs.rc +++ b/dll/win32/ubtrfs/ubtrfs.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,1,0 - PRODUCTVERSION 1,0,1,0 + FILEVERSION 1,0,2,0 + PRODUCTVERSION 1,0,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -68,12 +68,12 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "FileDescription", "Btrfs utility DLL" - VALUE "FileVersion", "1.0.1" + VALUE "FileVersion", "1.0.2" VALUE "InternalName", "ubtrfs" - VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-17" + VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-18" VALUE "OriginalFilename", "ubtrfs.dll" VALUE "ProductName", "WinBtrfs" - VALUE "ProductVersion", "1.0.1" + VALUE "ProductVersion", "1.0.2" END END BLOCK "VarFileInfo" diff --git a/media/doc/README.FSD b/media/doc/README.FSD index 52540f06c0..c4afbdc1f8 100644 --- a/media/doc/README.FSD +++ b/media/doc/README.FSD @@ -5,7 +5,7 @@ The following FSD are shared with: https://github.com/maharmstone/btrfs. reactos/drivers/filesystems/btrfs # Synced to 1.0.2 reactos/dll/shellext/shellbtrfs # Synced to 1.0.2 -reactos/sdk/lib/fslib/btrfslib # Synced to 1.0.1 +reactos/sdk/lib/fslib/btrfslib # Synced to 1.0.2 The following FSD are shared with: http://www.ext2fsd.com/

1 0

02/03: [SHELLBTRFS] Upgrade to 1.0.2
by Pierre Schweitzer 26 May '18

26 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2da53310a4b21da9cc804… commit 2da53310a4b21da9cc804b88185df8a6076bd2e7 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat May 26 10:58:48 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat May 26 10:58:48 2018 +0200 [SHELLBTRFS] Upgrade to 1.0.2 CORE-14655 --- dll/shellext/shellbtrfs/contextmenu.cpp | 4 ++++ dll/shellext/shellbtrfs/recv.cpp | 1 + dll/shellext/shellbtrfs/scrub.cpp | 8 ++++++-- dll/shellext/shellbtrfs/send.cpp | 4 ++-- dll/shellext/shellbtrfs/shellbtrfs.rc | 10 +++++----- media/doc/README.FSD | 2 +- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dll/shellext/shellbtrfs/contextmenu.cpp b/dll/shellext/shellbtrfs/contextmenu.cpp index 1e004ceea1..a306190799 100644 --- a/dll/shellext/shellbtrfs/contextmenu.cpp +++ b/dll/shellext/shellbtrfs/contextmenu.cpp @@ -900,6 +900,7 @@ BOOL BtrfsContextMenu::reflink_copy(HWND hwnd, const WCHAR* fn, const WCHAR* dir if (stream == INVALID_HANDLE_VALUE) { ShowError(hwnd, GetLastError()); + FindClose(h); goto end; } @@ -909,6 +910,7 @@ BOOL BtrfsContextMenu::reflink_copy(HWND hwnd, const WCHAR* fn, const WCHAR* dir if (!ReadFile(stream, data, fsd.StreamSize.QuadPart, &bytesret, NULL)) { ShowError(hwnd, GetLastError()); + FindClose(h); free(data); CloseHandle(stream); goto end; @@ -922,6 +924,7 @@ BOOL BtrfsContextMenu::reflink_copy(HWND hwnd, const WCHAR* fn, const WCHAR* dir if (stream == INVALID_HANDLE_VALUE) { ShowError(hwnd, GetLastError()); + FindClose(h); if (data) free(data); goto end; @@ -930,6 +933,7 @@ BOOL BtrfsContextMenu::reflink_copy(HWND hwnd, const WCHAR* fn, const WCHAR* dir if (data) { if (!WriteFile(stream, data, fsd.StreamSize.QuadPart, &bytesret, NULL)) { ShowError(hwnd, GetLastError()); + FindClose(h); free(data); CloseHandle(stream); goto end; diff --git a/dll/shellext/shellbtrfs/recv.cpp b/dll/shellext/shellbtrfs/recv.cpp index c3597fa412..5c1ab3646e 100644 --- a/dll/shellext/shellbtrfs/recv.cpp +++ b/dll/shellext/shellbtrfs/recv.cpp @@ -1649,6 +1649,7 @@ BOOL BtrfsRecv::do_recv(HANDLE f, UINT64* pos, UINT64 size) { if (!ReadFile(f, data, cmd.length, NULL, NULL)) { ShowRecvError(IDS_RECV_READFILE_FAILED, GetLastError(), format_message(GetLastError()).c_str()); + free(data); b = FALSE; break; } diff --git a/dll/shellext/shellbtrfs/scrub.cpp b/dll/shellext/shellbtrfs/scrub.cpp index 9e184221ca..87359a5561 100644 --- a/dll/shellext/shellbtrfs/scrub.cpp +++ b/dll/shellext/shellbtrfs/scrub.cpp @@ -620,15 +620,19 @@ void CALLBACK StartScrubW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int nC if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &token)) goto end; - if (!LookupPrivilegeValueW(NULL, L"SeManageVolumePrivilege", &luid)) + if (!LookupPrivilegeValueW(NULL, L"SeManageVolumePrivilege", &luid)) { + CloseHandle(token); goto end; + } tp.PrivilegeCount = 1; tp.Privileges[0].Luid = luid; tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - if (!AdjustTokenPrivileges(token, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), NULL, NULL)) + if (!AdjustTokenPrivileges(token, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), NULL, NULL)) { + CloseHandle(token); goto end; + } CloseHandle(token); diff --git a/dll/shellext/shellbtrfs/send.cpp b/dll/shellext/shellbtrfs/send.cpp index 220d5e212c..cbe5f7e26c 100644 --- a/dll/shellext/shellbtrfs/send.cpp +++ b/dll/shellext/shellbtrfs/send.cpp @@ -157,7 +157,7 @@ DWORD BtrfsSend::Thread() { goto end2; } - memcpy(header.magic, BTRFS_SEND_MAGIC, sizeof(BTRFS_SEND_MAGIC)); + memcpy(header.magic, BTRFS_SEND_MAGIC, sizeof(header.magic)); header.version = 1; if (!WriteFile(stream, &header, sizeof(header), NULL, NULL)) { @@ -654,7 +654,7 @@ static void send_subvol(std::wstring subvol, std::wstring file, std::wstring par if (!NT_SUCCESS(Status)) goto end2; - memcpy(header.magic, BTRFS_SEND_MAGIC, sizeof(BTRFS_SEND_MAGIC)); + memcpy(header.magic, BTRFS_SEND_MAGIC, sizeof(header.magic)); header.version = 1; if (!WriteFile(stream, &header, sizeof(header), NULL, NULL)) diff --git a/dll/shellext/shellbtrfs/shellbtrfs.rc b/dll/shellext/shellbtrfs/shellbtrfs.rc index 23d46d238b..5e2938ed1d 100644 --- a/dll/shellext/shellbtrfs/shellbtrfs.rc +++ b/dll/shellext/shellbtrfs/shellbtrfs.rc @@ -61,8 +61,8 @@ IDI_ICON1 ICON "subvol.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,1,0 - PRODUCTVERSION 1,0,1,0 + FILEVERSION 1,0,2,0 + PRODUCTVERSION 1,0,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -78,12 +78,12 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "FileDescription", "WinBtrfs shell extension" - VALUE "FileVersion", "1.0.1" + VALUE "FileVersion", "1.0.2" VALUE "InternalName", "btrfs" - VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-17" + VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-18" VALUE "OriginalFilename", "shellbtrfs.dll" VALUE "ProductName", "WinBtrfs" - VALUE "ProductVersion", "1.0.1" + VALUE "ProductVersion", "1.0.2" END END BLOCK "VarFileInfo" diff --git a/media/doc/README.FSD b/media/doc/README.FSD index e0faa8491d..52540f06c0 100644 --- a/media/doc/README.FSD +++ b/media/doc/README.FSD @@ -4,7 +4,7 @@ The following FSD are shared with: https://github.com/maharmstone/btrfs. reactos/drivers/filesystems/btrfs # Synced to 1.0.2 -reactos/dll/shellext/shellbtrfs # Synced to 1.0.1 +reactos/dll/shellext/shellbtrfs # Synced to 1.0.2 reactos/sdk/lib/fslib/btrfslib # Synced to 1.0.1 The following FSD are shared with: http://www.ext2fsd.com/

1 0

01/03: [BTRFS] Upgrade to 1.0.2
by Pierre Schweitzer 26 May '18

26 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7806a6b29a802b6fedca… commit c7806a6b29a802b6fedcaf6fdd6b4aba0c8a20ce Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat May 26 10:44:36 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat May 26 10:44:36 2018 +0200 [BTRFS] Upgrade to 1.0.2 CORE-14655 --- drivers/filesystems/btrfs/balance.c | 4 ---- drivers/filesystems/btrfs/btrfs.h | 2 +- drivers/filesystems/btrfs/btrfs.rc | 10 +++++----- drivers/filesystems/btrfs/btrfs_drv.h | 10 +++++----- drivers/filesystems/btrfs/calcthread.c | 4 +++- drivers/filesystems/btrfs/create.c | 2 +- drivers/filesystems/btrfs/fileinfo.c | 3 +++ drivers/filesystems/btrfs/flushthread.c | 3 ++- drivers/filesystems/btrfs/fsctl.c | 2 +- drivers/filesystems/btrfs/read.c | 2 -- drivers/filesystems/btrfs/registry.c | 14 ++++++++++---- drivers/filesystems/btrfs/scrub.c | 6 +++--- media/doc/README.FSD | 2 +- 13 files changed, 35 insertions(+), 29 deletions(-) diff --git a/drivers/filesystems/btrfs/balance.c b/drivers/filesystems/btrfs/balance.c index 980089618a..3e36489c31 100644 --- a/drivers/filesystems/btrfs/balance.c +++ b/drivers/filesystems/btrfs/balance.c @@ -1984,8 +1984,6 @@ static NTSTATUS balance_data_chunk(device_extension* Vcb, chunk* c, BOOL* change c, NULL, NULL, 0, FALSE, NormalPagePriority); if (!NT_SUCCESS(Status)) { ERR("read_data returned %08x\n", Status); - ExFreePool(csum); - ExFreePool(bmparr); goto end; } @@ -1993,8 +1991,6 @@ static NTSTATUS balance_data_chunk(device_extension* Vcb, chunk* c, BOOL* change NULL, newchunk, FALSE, 0, NormalPagePriority); if (!NT_SUCCESS(Status)) { ERR("write_data_complete returned %08x\n", Status); - ExFreePool(csum); - ExFreePool(bmparr); goto end; } diff --git a/drivers/filesystems/btrfs/btrfs.h b/drivers/filesystems/btrfs/btrfs.h index 01d2c3b9ab..27e9b63f51 100644 --- a/drivers/filesystems/btrfs/btrfs.h +++ b/drivers/filesystems/btrfs/btrfs.h @@ -562,7 +562,7 @@ typedef struct { #define BTRFS_SEND_TLV_CLONE_OFFSET 23 #define BTRFS_SEND_TLV_CLONE_LENGTH 24 -#define BTRFS_SEND_MAGIC "btrfs-stream\0" +#define BTRFS_SEND_MAGIC "btrfs-stream" typedef struct { UINT8 magic[13]; diff --git a/drivers/filesystems/btrfs/btrfs.rc b/drivers/filesystems/btrfs/btrfs.rc index d79da1aa15..50f7463328 100644 --- a/drivers/filesystems/btrfs/btrfs.rc +++ b/drivers/filesystems/btrfs/btrfs.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,1,0 - PRODUCTVERSION 1,0,1,0 + FILEVERSION 1,0,2,0 + PRODUCTVERSION 1,0,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "FileDescription", "WinBtrfs" - VALUE "FileVersion", "1.0.1" + VALUE "FileVersion", "1.0.2" VALUE "InternalName", "btrfs" - VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-17" + VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-18" VALUE "OriginalFilename", "btrfs.sys" VALUE "ProductName", "WinBtrfs" - VALUE "ProductVersion", "1.0.1" + VALUE "ProductVersion", "1.0.2" END END BLOCK "VarFileInfo" diff --git a/drivers/filesystems/btrfs/btrfs_drv.h b/drivers/filesystems/btrfs/btrfs_drv.h index 1cb50cbfa4..e5efc86b79 100644 --- a/drivers/filesystems/btrfs/btrfs_drv.h +++ b/drivers/filesystems/btrfs/btrfs_drv.h @@ -427,12 +427,7 @@ typedef struct _root { } root; enum batch_operation { - Batch_Insert, Batch_Delete, - Batch_SetXattr, - Batch_DirItem, - Batch_InodeRef, - Batch_InodeExtRef, Batch_DeleteInode, Batch_DeleteDirItem, Batch_DeleteInodeRef, @@ -440,6 +435,11 @@ enum batch_operation { Batch_DeleteXattr, Batch_DeleteExtentData, Batch_DeleteFreeSpace, + Batch_Insert, + Batch_SetXattr, + Batch_DirItem, + Batch_InodeRef, + Batch_InodeExtRef, }; typedef struct { diff --git a/drivers/filesystems/btrfs/calcthread.c b/drivers/filesystems/btrfs/calcthread.c index 2b6da81743..9bfb45a74c 100644 --- a/drivers/filesystems/btrfs/calcthread.c +++ b/drivers/filesystems/btrfs/calcthread.c @@ -37,12 +37,14 @@ NTSTATUS add_calc_job(device_extension* Vcb, UINT8* data, UINT32 sectors, UINT32 KeInitializeEvent(&cj->event, NotificationEvent, FALSE); ExAcquireResourceExclusiveLite(&Vcb->calcthreads.lock, TRUE); + InsertTailList(&Vcb->calcthreads.job_list, &cj->list_entry); - ExReleaseResourceLite(&Vcb->calcthreads.lock); KeSetEvent(&Vcb->calcthreads.event, 0, FALSE); KeClearEvent(&Vcb->calcthreads.event); + ExReleaseResourceLite(&Vcb->calcthreads.lock); + *pcj = cj; return STATUS_SUCCESS; diff --git a/drivers/filesystems/btrfs/create.c b/drivers/filesystems/btrfs/create.c index 191bf63be8..cd1106477b 100644 --- a/drivers/filesystems/btrfs/create.c +++ b/drivers/filesystems/btrfs/create.c @@ -3103,7 +3103,7 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur allowed |= DELETE; if (fileref->fcb != Vcb->dummy_fcb && !is_subvol_readonly(fileref->fcb->subvol, Irp) && !Vcb->readonly) { - allowed |= WRITE_OWNER | WRITE_DAC | FILE_WRITE_EA | FILE_WRITE_ATTRIBUTES; + allowed |= DELETE | WRITE_OWNER | WRITE_DAC | FILE_WRITE_EA | FILE_WRITE_ATTRIBUTES; if (!fileref->fcb->ads && fileref->fcb->type == BTRFS_TYPE_DIRECTORY) allowed |= FILE_ADD_SUBDIRECTORY | FILE_ADD_FILE | FILE_DELETE_CHILD; diff --git a/drivers/filesystems/btrfs/fileinfo.c b/drivers/filesystems/btrfs/fileinfo.c index 9f736671da..9588ea177e 100644 --- a/drivers/filesystems/btrfs/fileinfo.c +++ b/drivers/filesystems/btrfs/fileinfo.c @@ -2064,6 +2064,9 @@ static NTSTATUS set_end_of_file_information(device_extension* Vcb, PIRP Irp, PFI ERR("error - extend_file failed\n"); goto end; } + } else if ((UINT64)feofi->EndOfFile.QuadPart == fcb->inode_item.st_size && advance_only) { + Status = STATUS_SUCCESS; + goto end; } ccfs.AllocationSize = fcb->Header.AllocationSize; diff --git a/drivers/filesystems/btrfs/flushthread.c b/drivers/filesystems/btrfs/flushthread.c index ceb37c5a2a..9e95f82834 100644 --- a/drivers/filesystems/btrfs/flushthread.c +++ b/drivers/filesystems/btrfs/flushthread.c @@ -4254,8 +4254,9 @@ NTSTATUS insert_tree_item_batch(LIST_ENTRY* batchlist, device_extension* Vcb, ro le = br->items.Blink; while (le != &br->items) { batch_item* bi2 = CONTAINING_RECORD(le, batch_item, list_entry); + int cmp = keycmp(bi2->key, bi->key); - if (keycmp(bi2->key, bi->key) != 1) { + if (cmp == -1 || (cmp == 0 && bi->operation >= bi2->operation)) { InsertHeadList(&bi2->list_entry, &bi->list_entry); return STATUS_SUCCESS; } diff --git a/drivers/filesystems/btrfs/fsctl.c b/drivers/filesystems/btrfs/fsctl.c index 87556c47e1..6cc0f45ab1 100644 --- a/drivers/filesystems/btrfs/fsctl.c +++ b/drivers/filesystems/btrfs/fsctl.c @@ -5065,7 +5065,7 @@ NTSTATUS fsctl_request(PDEVICE_OBJECT DeviceObject, PIRP* Pirp, UINT32 type) { Status = STATUS_INVALID_DEVICE_REQUEST; break; -#if WIN32_WINNT >= 0x0600 +#if _WIN32_WINNT >= 0x0600 case FSCTL_MAKE_MEDIA_COMPATIBLE: WARN("STUB: FSCTL_MAKE_MEDIA_COMPATIBLE\n"); Status = STATUS_INVALID_DEVICE_REQUEST; diff --git a/drivers/filesystems/btrfs/read.c b/drivers/filesystems/btrfs/read.c index ddeea66c7a..81fbec3d68 100644 --- a/drivers/filesystems/btrfs/read.c +++ b/drivers/filesystems/btrfs/read.c @@ -2093,7 +2093,6 @@ NTSTATUS read_data(_In_ device_extension* Vcb, _In_ UINT64 addr, _In_ UINT32 len if (!dummy_mdl) { ERR("IoAllocateMdl failed\n"); Status = STATUS_INSUFFICIENT_RESOURCES; - ExFreePool(dummypage); goto exit; } @@ -2347,7 +2346,6 @@ NTSTATUS read_data(_In_ device_extension* Vcb, _In_ UINT64 addr, _In_ UINT32 len if (!dummy_mdl) { ERR("IoAllocateMdl failed\n"); Status = STATUS_INSUFFICIENT_RESOURCES; - ExFreePool(dummypage); goto exit; } diff --git a/drivers/filesystems/btrfs/registry.c b/drivers/filesystems/btrfs/registry.c index 9e4d9ea08d..05f66f5df2 100644 --- a/drivers/filesystems/btrfs/registry.c +++ b/drivers/filesystems/btrfs/registry.c @@ -923,21 +923,27 @@ void read_registry(PUNICODE_STRING regpath, BOOL refresh) { ERR("LogFile was type %u, length %u\n", kvfi->Type, kvfi->DataLength); Status = ZwDeleteValueKey(h, &us); - if (!NT_SUCCESS(Status)) { + if (!NT_SUCCESS(Status)) ERR("ZwDeleteValueKey returned %08x\n", Status); - } + + log_file.Length = 0; } + } else { + ERR("ZwQueryValueKey returned %08\n", Status); + log_file.Length = 0; } ExFreePool(kvfi); } else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { Status = ZwSetValueKey(h, &us, 0, REG_SZ, def_log_file, (ULONG)(wcslen(def_log_file) + 1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) { + if (!NT_SUCCESS(Status)) ERR("ZwSetValueKey returned %08x\n", Status); - } + + log_file.Length = 0; } else { ERR("ZwQueryValueKey returned %08x\n", Status); + log_file.Length = 0; } if (log_file.Length == 0) { diff --git a/drivers/filesystems/btrfs/scrub.c b/drivers/filesystems/btrfs/scrub.c index bab1241579..9dd7c2008d 100644 --- a/drivers/filesystems/btrfs/scrub.c +++ b/drivers/filesystems/btrfs/scrub.c @@ -2113,10 +2113,10 @@ static void scrub_raid6_stripe(device_extension* Vcb, chunk* c, scrub_context_ra } do_xor(scratch, &context->stripes[parity2].buf[(num * c->chunk_item->stripe_length) + (i * Vcb->superblock.sector_size)], len); - } - if (bad_stripe_num != 0) - galois_divpower(scratch, (UINT8)bad_stripe_num, len); + if (bad_stripe_num != 0) + galois_divpower(scratch, (UINT8)bad_stripe_num, len); + } if (RtlCheckBit(&context->is_tree, bad_off1)) { tree_header *th1 = NULL, *th2 = NULL; diff --git a/media/doc/README.FSD b/media/doc/README.FSD index 8cb1f12970..e0faa8491d 100644 --- a/media/doc/README.FSD +++ b/media/doc/README.FSD @@ -3,7 +3,7 @@ The following FSD are shared with: https://github.com/maharmstone/btrfs. -reactos/drivers/filesystems/btrfs # Synced to 1.0.1 +reactos/drivers/filesystems/btrfs # Synced to 1.0.2 reactos/dll/shellext/shellbtrfs # Synced to 1.0.1 reactos/sdk/lib/fslib/btrfslib # Synced to 1.0.1

1 0

01/01: [FASTFAT] Initialize cache if neded for changing volume label.
by Pierre Schweitzer 26 May '18

26 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47b9db9d029c5f53d4934… commit 47b9db9d029c5f53d49343677998c70ed85d791d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat May 26 10:12:00 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat May 26 10:12:55 2018 +0200 [FASTFAT] Initialize cache if neded for changing volume label. CORE-14654 --- drivers/filesystems/fastfat/volume.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/filesystems/fastfat/volume.c b/drivers/filesystems/fastfat/volume.c index 7222b9bceb..f4f8f738eb 100644 --- a/drivers/filesystems/fastfat/volume.c +++ b/drivers/filesystems/fastfat/volume.c @@ -313,6 +313,11 @@ FsdSetFsLabelInformation( } pRootFcb = vfatOpenRootFCB(DeviceExt); + Status = vfatFCBInitializeCacheFromVolume(DeviceExt, pRootFcb); + if (!NT_SUCCESS(Status)) + { + return Status; + } /* Search existing volume entry on disk */ FileOffset.QuadPart = 0;

1 0

01/01: [MSGINA] Clean-up the resource IDs and the dialog function names.
by Eric Kohl 25 May '18

25 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4db10a404c420e2605a7e… commit 4db10a404c420e2605a7e13e3397f8579a4a2599 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 26 01:54:58 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 26 01:54:58 2018 +0200 [MSGINA] Clean-up the resource IDs and the dialog function names. --- dll/win32/msgina/gui.c | 94 ++++++++++++++++++++--------------------- dll/win32/msgina/lang/bg-BG.rc | 66 ++++++++++++++--------------- dll/win32/msgina/lang/cs-CZ.rc | 66 ++++++++++++++--------------- dll/win32/msgina/lang/de-DE.rc | 68 +++++++++++++++--------------- dll/win32/msgina/lang/en-US.rc | 77 +++++++++++++++++++--------------- dll/win32/msgina/lang/es-ES.rc | 68 +++++++++++++++--------------- dll/win32/msgina/lang/fr-FR.rc | 66 ++++++++++++++--------------- dll/win32/msgina/lang/he-IL.rc | 66 ++++++++++++++--------------- dll/win32/msgina/lang/id-ID.rc | 68 +++++++++++++++--------------- dll/win32/msgina/lang/it-IT.rc | 68 +++++++++++++++--------------- dll/win32/msgina/lang/ja-JP.rc | 66 ++++++++++++++--------------- dll/win32/msgina/lang/no-NO.rc | 66 ++++++++++++++--------------- dll/win32/msgina/lang/pl-PL.rc | 66 ++++++++++++++--------------- dll/win32/msgina/lang/ro-RO.rc | 68 +++++++++++++++--------------- dll/win32/msgina/lang/ru-RU.rc | 66 ++++++++++++++--------------- dll/win32/msgina/lang/sk-SK.rc | 66 ++++++++++++++--------------- dll/win32/msgina/lang/sq-AL.rc | 66 ++++++++++++++--------------- dll/win32/msgina/lang/tr-TR.rc | 68 +++++++++++++++--------------- dll/win32/msgina/lang/uk-UA.rc | 66 ++++++++++++++--------------- dll/win32/msgina/lang/zh-CN.rc | 68 +++++++++++++++--------------- dll/win32/msgina/lang/zh-TW.rc | 68 +++++++++++++++--------------- dll/win32/msgina/resource.h | 95 ++++++++++++++++++++++++------------------ dll/win32/msgina/shutdown.c | 16 +++---- 23 files changed, 787 insertions(+), 765 deletions(-) diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index 2f4e687294..d148088db3 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -51,7 +51,7 @@ SetWelcomeText(HWND hWnd) DWORD BufSize, dwType, dwWelcomeSize, dwTitleLength; LONG rc; - TRACE("GetWelcomeText(%p)\n", hWnd); + TRACE("SetWelcomeText(%p)\n", hWnd); /* Get the path of userinit */ rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -105,7 +105,7 @@ done: static INT_PTR CALLBACK -StatusMessageWindowProc( +StatusDialogProc( IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, @@ -125,7 +125,7 @@ StatusMessageWindowProc( if (msg->pTitle) SetWindowTextW(hwndDlg, msg->pTitle); - SetDlgItemTextW(hwndDlg, IDC_STATUSLABEL, msg->pMessage); + SetDlgItemTextW(hwndDlg, IDC_STATUS_MESSAGE, msg->pMessage); SetEvent(msg->StartupEvent); return TRUE; } @@ -163,9 +163,9 @@ StartupWindowThread(LPVOID lpParam) DialogBoxParamW( hDllInstance, - MAKEINTRESOURCEW(IDD_STATUSWINDOW_DLG), + MAKEINTRESOURCEW(IDD_STATUS), GetDesktopWindow(), - StatusMessageWindowProc, + StatusDialogProc, (LPARAM)lpParam); HeapFree(GetProcessHeap(), 0, lpParam); @@ -242,7 +242,7 @@ GUIDisplayStatusMessage( if (pTitle) SetWindowTextW(pgContext->hStatusWindow, pTitle); - SetDlgItemTextW(pgContext->hStatusWindow, IDC_STATUSLABEL, pMessage); + SetDlgItemTextW(pgContext->hStatusWindow, IDC_STATUS_MESSAGE, pMessage); return TRUE; } @@ -261,7 +261,7 @@ GUIRemoveStatusMessage( } static INT_PTR CALLBACK -NoticeWindowProc( +WelcomeDialogProc( IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, @@ -318,9 +318,9 @@ GUIDisplaySASNotice( /* Display the notice window */ pgContext->pWlxFuncs->WlxDialogBoxParam(pgContext->hWlx, pgContext->hDllInstance, - MAKEINTRESOURCEW(IDD_NOTICE_DLG), + MAKEINTRESOURCEW(IDD_WELCOME), GetDesktopWindow(), - NoticeWindowProc, + WelcomeDialogProc, (LPARAM)pgContext); } @@ -598,7 +598,7 @@ OnInitSecurityDlg(HWND hwnd, wsprintfW(Buffer2, L"%s\\%s", pgContext->DomainName, pgContext->UserName); wsprintfW(Buffer4, Buffer1, Buffer2); - SetDlgItemTextW(hwnd, IDC_LOGONMSG, Buffer4); + SetDlgItemTextW(hwnd, IDC_SECURITY_MESSAGE, Buffer4); LoadStringW(pgContext->hDllInstance, IDS_LOGONDATE, Buffer1, _countof(Buffer1)); @@ -610,10 +610,10 @@ OnInitSecurityDlg(HWND hwnd, wsprintfW(Buffer4, Buffer1, Buffer2, Buffer3); - SetDlgItemTextW(hwnd, IDC_LOGONDATE, Buffer4); + SetDlgItemTextW(hwnd, IDC_SECURITY_LOGONDATE, Buffer4); if (pgContext->bAutoAdminLogon) - EnableWindow(GetDlgItem(hwnd, IDC_LOGOFF), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_SECURITY_LOGOFF), FALSE); } @@ -629,7 +629,7 @@ OnChangePassword( res = pgContext->pWlxFuncs->WlxDialogBoxParam( pgContext->hWlx, pgContext->hDllInstance, - MAKEINTRESOURCEW(IDD_CHANGE_PASSWORD), + MAKEINTRESOURCEW(IDD_CHANGEPWD), hwnd, ChangePasswordDialogProc, (LPARAM)pgContext); @@ -683,7 +683,7 @@ OnLogOff( return pgContext->pWlxFuncs->WlxDialogBoxParam( pgContext->hWlx, pgContext->hDllInstance, - MAKEINTRESOURCEW(IDD_LOGOFF_DLG), + MAKEINTRESOURCEW(IDD_LOGOFF), hwndDlg, LogOffDialogProc, (LPARAM)pgContext); @@ -741,7 +741,7 @@ OnShutDown( static INT_PTR CALLBACK -LoggedOnWindowProc( +SecurityDialogProc( IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, @@ -769,22 +769,22 @@ LoggedOnWindowProc( { switch (LOWORD(wParam)) { - case IDC_LOCK: + case IDC_SECURITY_LOCK: EndDialog(hwndDlg, WLX_SAS_ACTION_LOCK_WKSTA); return TRUE; - case IDC_LOGOFF: + case IDC_SECURITY_LOGOFF: if (OnLogOff(hwndDlg, pgContext) == IDYES) EndDialog(hwndDlg, WLX_SAS_ACTION_LOGOFF); return TRUE; - case IDC_SHUTDOWN: + case IDC_SECURITY_SHUTDOWN: if (OnShutDown(hwndDlg, pgContext) == IDOK) EndDialog(hwndDlg, pgContext->nShutdownAction); return TRUE; - case IDC_CHANGEPWD: + case IDC_SECURITY_CHANGEPWD: if (OnChangePassword(hwndDlg, pgContext)) EndDialog(hwndDlg, WLX_SAS_ACTION_PWD_CHANGED); return TRUE; - case IDC_TASKMGR: + case IDC_SECURITY_TASKMGR: EndDialog(hwndDlg, WLX_SAS_ACTION_TASKLIST); return TRUE; case IDCANCEL: @@ -825,9 +825,9 @@ GUILoggedOnSAS( result = pgContext->pWlxFuncs->WlxDialogBoxParam( pgContext->hWlx, pgContext->hDllInstance, - MAKEINTRESOURCEW(IDD_LOGGEDON_DLG), + MAKEINTRESOURCEW(IDD_SECURITY), GetDesktopWindow(), - LoggedOnWindowProc, + SecurityDialogProc, (LPARAM)pgContext); if (result < WLX_SAS_ACTION_LOGON || @@ -858,13 +858,13 @@ DoLogon( BOOL result = FALSE; NTSTATUS Status, SubStatus = STATUS_SUCCESS; - if (GetTextboxText(hwndDlg, IDC_USERNAME, &UserName) && *UserName == '\0') + if (GetTextboxText(hwndDlg, IDC_LOGON_USERNAME, &UserName) && *UserName == '\0') goto done; - if (GetTextboxText(hwndDlg, IDC_LOGON_TO, &Domain) && *Domain == '\0') + if (GetTextboxText(hwndDlg, IDC_LOGON_DOMAIN, &Domain) && *Domain == '\0') goto done; - if (!GetTextboxText(hwndDlg, IDC_PASSWORD, &Password)) + if (!GetTextboxText(hwndDlg, IDC_LOGON_PASSWORD, &Password)) goto done; Status = DoLoginTasks(pgContext, UserName, Domain, Password, &SubStatus); @@ -1014,7 +1014,7 @@ SetDomainComboBox( static INT_PTR CALLBACK -LoggedOutWindowProc( +LogonDialogProc( IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, @@ -1044,20 +1044,20 @@ LoggedOutWindowProc( if (pDlgData->pgContext->bAutoAdminLogon || !pDlgData->pgContext->bDontDisplayLastUserName) - SetDlgItemTextW(hwndDlg, IDC_USERNAME, pDlgData->pgContext->UserName); + SetDlgItemTextW(hwndDlg, IDC_LOGON_USERNAME, pDlgData->pgContext->UserName); if (pDlgData->pgContext->bAutoAdminLogon) - SetDlgItemTextW(hwndDlg, IDC_PASSWORD, pDlgData->pgContext->Password); + SetDlgItemTextW(hwndDlg, IDC_LOGON_PASSWORD, pDlgData->pgContext->Password); - SetDomainComboBox(GetDlgItem(hwndDlg, IDC_LOGON_TO), pDlgData->pgContext); + SetDomainComboBox(GetDlgItem(hwndDlg, IDC_LOGON_DOMAIN), pDlgData->pgContext); if (pDlgData->pgContext->bDisableCAD) EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); if (!pDlgData->pgContext->bShutdownWithoutLogon) - EnableWindow(GetDlgItem(hwndDlg, IDC_SHUTDOWN), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_SHUTDOWN), FALSE); - SetFocus(GetDlgItem(hwndDlg, pDlgData->pgContext->bDontDisplayLastUserName ? IDC_USERNAME : IDC_PASSWORD)); + SetFocus(GetDlgItem(hwndDlg, pDlgData->pgContext->bDontDisplayLastUserName ? IDC_LOGON_USERNAME : IDC_LOGON_PASSWORD)); if (pDlgData->pgContext->bAutoAdminLogon) PostMessage(GetDlgItem(hwndDlg, IDOK), BM_CLICK, 0, 0); @@ -1094,7 +1094,7 @@ LoggedOutWindowProc( EndDialog(hwndDlg, WLX_SAS_ACTION_NONE); return TRUE; - case IDC_SHUTDOWN: + case IDC_LOGON_SHUTDOWN: if (OnShutDown(hwndDlg, pDlgData->pgContext) == IDOK) EndDialog(hwndDlg, pDlgData->pgContext->nShutdownAction); return TRUE; @@ -1177,7 +1177,7 @@ GUILoggedOutSAS( { pgContext->pWlxFuncs->WlxDialogBoxParam(pgContext->hWlx, pgContext->hDllInstance, - MAKEINTRESOURCEW(IDD_LEGALNOTICE_DLG), + MAKEINTRESOURCEW(IDD_LEGALNOTICE), GetDesktopWindow(), LegalNoticeDialogProc, (LPARAM)&LegalNotice); @@ -1192,9 +1192,9 @@ GUILoggedOutSAS( result = pgContext->pWlxFuncs->WlxDialogBoxParam( pgContext->hWlx, pgContext->hDllInstance, - MAKEINTRESOURCEW(IDD_LOGGEDOUT_DLG), + MAKEINTRESOURCEW(IDD_LOGON), GetDesktopWindow(), - LoggedOutWindowProc, + LogonDialogProc, (LPARAM)pgContext); if (result >= WLX_SAS_ACTION_LOGON && result <= WLX_SAS_ACTION_SWITCH_CONSOLE) @@ -1239,13 +1239,13 @@ DoUnlock( LPWSTR Password = NULL; BOOL res = FALSE; - if (GetTextboxText(hwndDlg, IDC_USERNAME, &UserName) && *UserName == '\0') + if (GetTextboxText(hwndDlg, IDC_UNLOCK_USERNAME, &UserName) && *UserName == '\0') { HeapFree(GetProcessHeap(), 0, UserName); return FALSE; } - if (GetTextboxText(hwndDlg, IDC_PASSWORD, &Password)) + if (GetTextboxText(hwndDlg, IDC_UNLOCK_PASSWORD, &Password)) { if (UserName != NULL && Password != NULL && wcscmp(UserName, pgContext->UserName) == 0 && @@ -1293,7 +1293,7 @@ DoUnlock( static INT_PTR CALLBACK -UnlockWindowProc( +UnlockDialogProc( IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, @@ -1318,10 +1318,10 @@ UnlockWindowProc( SetWelcomeText(hwndDlg); - SetLockMessage(hwndDlg, IDC_LOCKMSG, pDlgData->pgContext); + SetLockMessage(hwndDlg, IDC_UNLOCK_MESSAGE, pDlgData->pgContext); - SetDlgItemTextW(hwndDlg, IDC_USERNAME, pDlgData->pgContext->UserName); - SetFocus(GetDlgItem(hwndDlg, IDC_PASSWORD)); + SetDlgItemTextW(hwndDlg, IDC_UNLOCK_USERNAME, pDlgData->pgContext->UserName); + SetFocus(GetDlgItem(hwndDlg, IDC_UNLOCK_PASSWORD)); if (pDlgData->pgContext->bDisableCAD) EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); @@ -1377,9 +1377,9 @@ GUILockedSAS( result = pgContext->pWlxFuncs->WlxDialogBoxParam( pgContext->hWlx, pgContext->hDllInstance, - MAKEINTRESOURCEW(IDD_UNLOCK_DLG), + MAKEINTRESOURCEW(IDD_UNLOCK), GetDesktopWindow(), - UnlockWindowProc, + UnlockDialogProc, (LPARAM)pgContext); if (result >= WLX_SAS_ACTION_LOGON && result <= WLX_SAS_ACTION_SWITCH_CONSOLE) @@ -1394,7 +1394,7 @@ GUILockedSAS( static INT_PTR CALLBACK -LockedWindowProc( +LockedDialogProc( IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, @@ -1421,7 +1421,7 @@ LockedWindowProc( SetWelcomeText(hwndDlg); - SetLockMessage(hwndDlg, IDC_LOCKMSG, pDlgData->pgContext); + SetLockMessage(hwndDlg, IDC_LOCKED_MESSAGE, pDlgData->pgContext); return TRUE; } case WM_PAINT: @@ -1456,9 +1456,9 @@ GUIDisplayLockedNotice( pgContext->pWlxFuncs->WlxDialogBoxParam( pgContext->hWlx, pgContext->hDllInstance, - MAKEINTRESOURCEW(IDD_LOCKED_DLG), + MAKEINTRESOURCEW(IDD_LOCKED), GetDesktopWindow(), - LockedWindowProc, + LockedDialogProc, (LPARAM)pgContext); } diff --git a/dll/win32/msgina/lang/bg-BG.rc b/dll/win32/msgina/lang/bg-BG.rc index eb50ec86ac..9c740958da 100644 --- a/dll/win32/msgina/lang/bg-BG.rc +++ b/dll/win32/msgina/lang/bg-BG.rc @@ -1,15 +1,15 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Почакайте..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "РеактОС ви приветства" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -19,71 +19,71 @@ BEGIN LTEXT "Натиснете едновременно Ctrl-Alt-Del", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Вход" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Потребител:", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Парола:", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Добре", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Отказ", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "Изключване", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "Изключване", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Сигурност" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Logon Information", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Какво желаете?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Заключване на компютъра", IDC_LOCK, 7, 124, 99, 14 - PUSHBUTTON "Изход...", IDC_LOGOFF, 108, 124, 80, 14 - PUSHBUTTON "Изключване...", IDC_SHUTDOWN, 190, 124, 78, 14 - PUSHBUTTON "Change Password...", IDC_CHANGEPWD, 7, 143, 99, 14 - PUSHBUTTON "Задачен управител", IDC_TASKMGR, 108, 143, 80, 14 + PUSHBUTTON "Заключване на компютъра", IDC_SECURITY_LOCK, 7, 124, 99, 14 + PUSHBUTTON "Изход...", IDC_SECURITY_LOGOFF, 108, 124, 80, 14 + PUSHBUTTON "Изключване...", IDC_SECURITY_SHUTDOWN, 190, 124, 78, 14 + PUSHBUTTON "Change Password...", IDC_SECURITY_CHANGEPWD, 7, 143, 99, 14 + PUSHBUTTON "Задачен управител", IDC_SECURITY_TASKMGR, 108, 143, 80, 14 PUSHBUTTON "Отказ", IDCANCEL, 190, 143, 78, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer Locked" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 37, 61, 231, 8 - LTEXT "Message", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Press Ctrl-Alt-Del to unlock this computer.", IDC_STATIC, 37, 106, 231, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Unlock Computer" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "User name:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Password:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Change Password" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -103,26 +103,26 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Изключване на РеактОС" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Какво искате да направи компютъра?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "Добре", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Отказ", IDCANCEL, 204, 122, 55, 14 @@ -139,9 +139,9 @@ CAPTION "Изключване на РеактОС" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Какво искате да направи компютъра?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -159,7 +159,7 @@ BEGIN // PUSHBUTTON "Помо&щ", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/cs-CZ.rc b/dll/win32/msgina/lang/cs-CZ.rc index 1003d47316..ed7faa0087 100644 --- a/dll/win32/msgina/lang/cs-CZ.rc +++ b/dll/win32/msgina/lang/cs-CZ.rc @@ -5,16 +5,16 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Prosím čekejte..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Vítejte v systému ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -24,71 +24,71 @@ BEGIN LTEXT "Stiskněte klávesy Ctrl-Alt-Delete", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Přihlášení" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Jméno:", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Heslo:", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Přihlásit na:", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Storno", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "Vypnout", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "Vypnout", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bezpečnost" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Přihlašovací údaje", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Co chcete udělat?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Uzamknout počítač", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "Odhlásit...", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "Vypnout...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "Změnit heslo...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "Správce úloh", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "Uzamknout počítač", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "Odhlásit...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "Vypnout...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "Změnit heslo...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "Správce úloh", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "Storno", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Počítač je uzamčen" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Tento počítač je momentálně používán a je uzamčen.", IDC_STATIC, 37, 61, 231, 8 - LTEXT "Zpráva", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Stisknutím kláves Ctrl-Alt-Del odemknete počítač.", IDC_STATIC, 37, 106, 231, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Odemknout počítač" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Tento počítač je momentálně používán a je uzamčen.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Zpráva", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "Uživatelské jméno:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Heslo:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Storno", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Změnit heslo" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -108,26 +108,26 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Odhlásit se ze systému" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Opravdu se chcete odhlásit?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Ano", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Ne", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Vypnout ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Co má počítač provést?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Storno", IDCANCEL, 204, 122, 55, 14 @@ -144,9 +144,9 @@ CAPTION "Vypnout ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Co má počítač provést?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -164,7 +164,7 @@ BEGIN // PUSHBUTTON "&Nápověda", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/de-DE.rc b/dll/win32/msgina/lang/de-DE.rc index 1dbe4acf25..c1308c1ccf 100644 --- a/dll/win32/msgina/lang/de-DE.rc +++ b/dll/win32/msgina/lang/de-DE.rc @@ -1,89 +1,89 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bitte warten..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Willkommen bei ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Drücken Sie Strg+Alt+Entf",IDC_STATIC, 38, 60, 230, 14 + LTEXT "Drücken Sie Strg+Alt+Entf", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Anmeldung" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Benutzername:", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Passwort:", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Anmelden an:", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK", IDOK, 91, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Abbrechen", IDCANCEL, 145, 122, 50, 14 - PUSHBUTTON "Herunterfahren", IDC_SHUTDOWN, 199, 122, 65, 14 + PUSHBUTTON "Herunterfahren", IDC_LOGON_SHUTDOWN, 199, 122, 65, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Sicherheit" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Anmeldeinformation", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Was wollen Sie tun?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Computer sperren", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "Abmelden...", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "Herunterfahren...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "Passwort ändern...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "Task-Manager", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "Computer sperren", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "Abmelden...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "Herunterfahren...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "Passwort ändern...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "Task-Manager", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer gesperrt" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Dieser Computer wird verwendet und ist gesperrt.", IDC_STATIC, 37, 61, 231, 8 - LTEXT "Nachricht", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Drücken Sie Strg+Alt+Entf um den Computer zu entsperren.", IDC_STATIC, 37, 106, 231, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer entsperren" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Dieser Computer wird verwendet und ist gesperrt.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Nachricht", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "Benutzername:", IDC_STATIC, 36, 107, 54, 8 - EDITTEXT IDC_USERNAME, 92, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 92, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Passwort:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 92, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 92, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Abbrechen", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Passwort ändern" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -103,26 +103,26 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Von ReactOS abmelden" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Wollen Sie sich wirklich abmelden?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Ja", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Nein", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOS herunterfahren" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Welcher Vorgang soll durchgeführt werden?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Abbrechen", IDCANCEL, 204, 122, 55, 14 @@ -139,9 +139,9 @@ CAPTION "ReactOS herunterfahren" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Welcher Vorgang soll durchgeführt werden?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Ereignisprotokollierung", IDC_STATIC, 9, 122, 257, 146 LTEXT "Wählen Sie die Option, die am besten beschreibt, warum der Computer heruntergefahren werden soll.", IDC_STATIC, 39, 134, 190, 17 @@ -159,7 +159,7 @@ BEGIN // PUSHBUTTON "&Hilfe", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc index d880de222e..b0ce0c6299 100644 --- a/dll/win32/msgina/lang/en-US.rc +++ b/dll/win32/msgina/lang/en-US.rc @@ -1,89 +1,89 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Welcome to ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Press Ctrl-Alt-Delete to begin.",IDC_STATIC, 38, 60, 230, 14 + LTEXT "Press Ctrl-Alt-Delete to begin.", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Logon" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Username:", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Password:", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "&Shut Down", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "&Shut Down", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Security" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Logon Information", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "What do you want to do?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Loc&k Computer", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "&Log Off...", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "&Shut Down...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "&Change Password...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "&Task Manager", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "Loc&k Computer", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "&Log Off...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "&Shut Down...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "&Change Password...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "&Task Manager", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "Cancel", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer Locked" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Press Ctrl-Alt-Del to unlock this computer.", IDC_STATIC, 36, 106, 232, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Unlock Computer" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "User name:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Password:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Change Password" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -103,27 +103,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION // STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Shut Down ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 @@ -140,9 +140,9 @@ CAPTION "Shut Down ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -160,7 +160,7 @@ BEGIN // PUSHBUTTON "&Help", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" @@ -169,6 +169,15 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END +IDD_HELP_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Logon Help" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Luna-XP-style Shut Down dialog" diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc index 2c416b8136..2539dbe40f 100644 --- a/dll/win32/msgina/lang/es-ES.rc +++ b/dll/win32/msgina/lang/es-ES.rc @@ -1,90 +1,90 @@ /* Spanish translation by Ismael Ferreras Morezuelas (2015-01-02) */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Espere un momento..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bienvenido a ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Para empezar, presione Ctrl-Alt-Supr.",IDC_STATIC, 38, 60, 230, 14 + LTEXT "Para empezar, presione Ctrl-Alt-Supr.", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Iniciar sesión" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Usuario:", IDC_STATIC, 6, 60, 61, 8, SS_RIGHT - EDITTEXT IDC_USERNAME, 71, 57, 144, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 71, 57, 144, 14, ES_AUTOHSCROLL LTEXT "Contraseña:", IDC_STATIC, 6, 78, 61, 8, SS_RIGHT - EDITTEXT IDC_PASSWORD, 71, 76, 144, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 71, 76, 144, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Iniciar sesión en:", IDC_STATIC, 6, 96, 61, 8, SS_RIGHT - COMBOBOX IDC_LOGON_TO, 71, 95, 144, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 71, 95, 144, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Aceptar", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "Cerrar", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "Cerrar", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Seguridad" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Información de inicio de sesión", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "¿Qué es lo que quiere hacer?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Bloquear el equipo", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "Cerrar sesión...", IDC_LOGOFF, 96, 124, 84, 14 - PUSHBUTTON "Apagar...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "Cambiar contraseña...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "Administrador de tareas", IDC_TASKMGR, 96, 143, 84, 14 + PUSHBUTTON "Bloquear el equipo", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "Cerrar sesión...", IDC_SECURITY_LOGOFF, 96, 124, 84, 14 + PUSHBUTTON "Apagar...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "Cambiar contraseña...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "Administrador de tareas", IDC_SECURITY_TASKMGR, 96, 143, 84, 14 PUSHBUTTON "Cancelar", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Equipo bloqueado" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Este equipo está en uso y ha sido bloqueado.", IDC_STATIC, 37, 61, 231, 8 - LTEXT "Mensaje", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Presione Ctrl-Alt-Supr para desbloquear el equipo.", IDC_STATIC, 37, 106, 231, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Desbloquear equipo" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Este equipo está en uso y ha sido bloqueado.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Mensaje", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "Usuario:", IDC_STATIC, 36, 107, 40, 8, SS_RIGHT - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Contraseña:", IDC_STATIC, 36, 125, 42, 8, SS_RIGHT - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "Aceptar", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Cambiar contraseña" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -104,26 +104,26 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Cerrar sesión de ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "¿Seguro que desea cerrar sesión?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Sí", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Apagar ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "¿&Qué desea hacer con el equipo?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "Aceptar", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Cancelar", IDCANCEL, 204, 122, 55, 14 @@ -140,9 +140,9 @@ CAPTION "Apagar ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "¿&Qué desea hacer con el equipo?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -160,7 +160,7 @@ BEGIN // PUSHBUTTON "&Ayuda", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc index 3daf346dac..03b6b88964 100644 --- a/dll/win32/msgina/lang/fr-FR.rc +++ b/dll/win32/msgina/lang/fr-FR.rc @@ -1,15 +1,15 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Veuillez patienter..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bienvenue dans ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -19,71 +19,71 @@ BEGIN LTEXT "Appuyer sur les touches Ctrl-Alt-Suppr", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Connexion" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Utilisateur :", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Mot de passe :", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Connexion à :", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Annuler", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "Éteindre", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "Éteindre", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Sécurité" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Informations de session", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Que voulez-vous faire ?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "&Verrouiller l'ordinateur", IDC_LOCK, 7, 124, 95, 14 - PUSHBUTTON "&Déconnecter...", IDC_LOGOFF, 104, 124, 82, 14 - PUSHBUTTON "Ét&eindre...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "&Changer le mot de passe...", IDC_CHANGEPWD, 7, 143, 95, 14 - PUSHBUTTON "&Gestionnaire de tâches", IDC_TASKMGR, 104, 143, 82, 14 + PUSHBUTTON "&Verrouiller l'ordinateur", IDC_SECURITY_LOCK, 7, 124, 95, 14 + PUSHBUTTON "&Déconnecter...", IDC_SECURITY_LOGOFF, 104, 124, 82, 14 + PUSHBUTTON "Ét&eindre...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "&Changer le mot de passe...", IDC_SECURITY_CHANGEPWD, 7, 143, 95, 14 + PUSHBUTTON "&Gestionnaire de tâches", IDC_SECURITY_TASKMGR, 104, 143, 82, 14 PUSHBUTTON "Annuler", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Ordinateur verrouillé" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Cet ordinateur est utilisé et a été verrouillé.", IDC_STATIC, 37, 61, 231, 8 - LTEXT "Message", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Appuyez sur les touches Ctrl-Alt-Suppr pour déverrouiller l'ordinateur.", IDC_STATIC, 37, 106, 231, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Déverrouiller l'ordinateur" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Cet ordinateur est actuellement verrouillé.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "Utilisateur :", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Mot de passe :", IDC_STATIC, 36, 125, 50, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Annuler", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Changer le mot de passe" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -103,26 +103,26 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Déconnexion de ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Êtes-vous sûr de vouloir vous déconnecter?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Oui", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Non", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Arrêt de ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Que voulez-vous que l'ordinateur fasse ?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Annuler", IDCANCEL, 204, 122, 55, 14 @@ -139,9 +139,9 @@ CAPTION "Arrêt de ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Que voulez-vous que l'ordinateur fasse ?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Moniteur d'événements de Mise hors tension", IDC_STATIC, 9, 122, 257, 146 LTEXT "Sélectionnez l'option qui décrit le mieux la raison pour laquelle vous voulez arrêter l'ordinateur.", IDC_STATIC, 39, 134, 190, 17 @@ -159,7 +159,7 @@ BEGIN // PUSHBUTTON "&Aide", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/he-IL.rc b/dll/win32/msgina/lang/he-IL.rc index 77e23f1bfb..708dc9274e 100644 --- a/dll/win32/msgina/lang/he-IL.rc +++ b/dll/win32/msgina/lang/he-IL.rc @@ -1,15 +1,15 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "נא להמתין..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ברוכים הבאים לReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -19,71 +19,71 @@ BEGIN LTEXT "לחץ על Ctrl-Alt-Del בו זמנית", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "כניסה" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "שם משתמש:", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "סיסמה:", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "אישור", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "ביטול", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "כיבוי", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "כיבוי", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "אבטחה" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "מידע כניסה", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "מה ברצונך לעשות?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "לנעול את המחשב", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "להתנתק...", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "לכבות...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "Change Password...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "מנהל המשימות", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "לנעול את המחשב", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "להתנתק...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "לכבות...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "Change Password...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "מנהל המשימות", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "ביטול", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "המחשב נעול" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "מחשב זה היה בשימוש וננעל.", IDC_STATIC, 37, 61, 231, 8 - LTEXT "Message", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "לחץ על Ctrl-Alt-Del כדי לשחרר את המחשב.", IDC_STATIC, 37, 106, 231, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ביטול הנעילה" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "מחשב זה היה בשימוש וננעל.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "שם משתמש:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "סיסמה:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "אישור", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "ביטול", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Change Password" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -103,26 +103,26 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Shut Down ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 @@ -139,9 +139,9 @@ CAPTION "Shut Down ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -159,7 +159,7 @@ BEGIN // PUSHBUTTON "&Help", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/id-ID.rc b/dll/win32/msgina/lang/id-ID.rc index 450f679f55..f705fda24b 100644 --- a/dll/win32/msgina/lang/id-ID.rc +++ b/dll/win32/msgina/lang/id-ID.rc @@ -1,89 +1,89 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Harap menunggu..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Selamat datang di ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Tekan kombinasi tombol Kontrol-Alt-Delete",IDC_STATIC, 38, 60, 230, 14 + LTEXT "Tekan kombinasi tombol Kontrol-Alt-Delete", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Masuk" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Nama pengguna:", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Kata sandi:", IDC_STATIC, 6, 78, 42, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Log on to:", IDC_STATIC, 6, 96, 42, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Batal", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "Matikan", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "Matikan", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Keamanan" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Logon Information", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Apa yang ingin anda lakukan?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Kunci komputer", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "Keluar...", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "Matikan...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "Change Password...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "Manager Tugas", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "Kunci komputer", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "Keluar...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "Matikan...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "Change Password...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "Manager Tugas", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "Batal", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer Locked" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 37, 61, 231, 8 - LTEXT "Message", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Press Ctrl-Alt-Del to unlock this computer.", IDC_STATIC, 37, 106, 231, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Unlock Computer" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "User name:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Password:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Change Password" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -103,26 +103,26 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Shut Down ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 @@ -139,9 +139,9 @@ CAPTION "Shut Down ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -159,7 +159,7 @@ BEGIN // PUSHBUTTON "&Help", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/it-IT.rc b/dll/win32/msgina/lang/it-IT.rc index ba74da4c6d..a21b8e7920 100644 --- a/dll/win32/msgina/lang/it-IT.rc +++ b/dll/win32/msgina/lang/it-IT.rc @@ -9,90 +9,90 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Attendere..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Benvenuti in ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Premere i tasti Ctrl-Alt-Canc ",IDC_STATIC, 38, 60, 230, 14 + LTEXT "Premere i tasti Ctrl-Alt-Canc ", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Logon" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Utente:", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Password:", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Accedi a:", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Annulla", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "Spegnimento", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "Spegnimento", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Sicurezza" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Informazioni Logon", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Cosa volete fare?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Bloccare il computer", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "Fine sessione...", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "Spegnimento...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "Cambia password...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "Gestione attività", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "Bloccare il computer", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "Fine sessione...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "Spegnimento...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "Cambia password...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "Gestione attività", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "Annulla", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer Bloccato" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Questo computer è in uso ed è stato bloccato.", IDC_STATIC, 37, 61, 231, 8 - LTEXT "Messaggio", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Premere Ctrl-Alt-Canc per sbloccare questo computer.", IDC_STATIC, 37, 106, 231, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Sblocco Computer" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Questo computer è in uso ed è stato bloccato.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "Utente:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Password:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Annulla", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Cambia password" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -112,26 +112,26 @@ BEGIN PUSHBUTTON "Cancella", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Disconetti da ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Sei sicuro di volerti disconettere?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Si", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Spegnimento di ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Cosa volete che faccia ReactOS?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Annulla", IDCANCEL, 204, 122, 55, 14 @@ -148,9 +148,9 @@ CAPTION "Spegnimento di ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Cosa volete che faccia ReactOS?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -168,7 +168,7 @@ BEGIN // PUSHBUTTON "&Aiuto", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index c50f12438c..c5a265d02e 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -1,15 +1,15 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "お待ちください..." FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ReactOS へようこそ" FONT 9, "MS UI Gothic", 400, 0, 1 @@ -19,71 +19,71 @@ BEGIN LTEXT "Ctrl-Alt-Del キーの組み合わせを押してください", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ログオン" FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "ユーザー名:", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "パスワード:", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "キャンセル", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "シャットダウン", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "シャットダウン", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "セキュリティ" FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Logon Information", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "何をしますか?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "コンピュータのロック", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "ログオフ...", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "シャットダウン...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "Change Password...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "タスクマネージャ", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "コンピュータのロック", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "ログオフ...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "シャットダウン...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "Change Password...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "タスクマネージャ", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "キャンセル", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer Locked" FONT 9,"MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 37, 61, 231, 8 - LTEXT "Message", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Press Ctrl-Alt-Del to unlock this computer.", IDC_STATIC, 37, 106, 231, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Unlock Computer" FONT 9,"MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "User name:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Password:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Change Password" FONT 9,"MS UI Gothic", 400, 0, 1 @@ -103,26 +103,26 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Log Off ReactOS" FONT 9,"MS UI Gothic", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOSのシャットダウン" FONT 9,"MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&コンピュータの動作を選択してください", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "キャンセル", IDCANCEL, 204, 122, 55, 14 @@ -139,9 +139,9 @@ CAPTION "ReactOSのシャットダウン" FONT 9,"MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&コンピュータの動作を選択してください", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -159,7 +159,7 @@ BEGIN // PUSHBUTTON "ヘルプ(&H)", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 9, "MS UI Gothic" diff --git a/dll/win32/msgina/lang/no-NO.rc b/dll/win32/msgina/lang/no-NO.rc index bda538b421..2772b08b18 100644 --- a/dll/win32/msgina/lang/no-NO.rc +++ b/dll/win32/msgina/lang/no-NO.rc @@ -1,15 +1,15 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Vent litt..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Velkommen til ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -19,71 +19,71 @@ BEGIN LTEXT "Trykk Ctrl-Alt-Del knappene", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Logg på ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Brukernavn:", IDC_STATIC, 36, 75, 40, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL LTEXT "Passord:", IDC_STATIC, 36, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Log on to:", IDC_STATIC, 6, 96, 42, 8 - COMBOBOX IDC_LOGON_TO, 54, 95, 159, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 54, 95, 159, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Avbryt", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "Avslutt", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "Avslutt", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ReactOS-sikkerhet" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Logon Information", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Hva vil du gjøre?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Lås datamaskinen", IDC_LOCK, 7, 124, 74, 14 - PUSHBUTTON "Logg av...", IDC_LOGOFF, 86, 124, 78, 14 - PUSHBUTTON "Avslutt...", IDC_SHUTDOWN, 170, 124, 70, 14 - PUSHBUTTON "Change Password...", IDC_CHANGEPWD, 7, 143, 76, 14 - PUSHBUTTON "Oppgavebehandling", IDC_TASKMGR, 86, 143, 78, 14 + PUSHBUTTON "Lås datamaskinen", IDC_SECURITY_LOCK, 7, 124, 74, 14 + PUSHBUTTON "Logg av...", IDC_SECURITY_LOGOFF, 86, 124, 78, 14 + PUSHBUTTON "Avslutt...", IDC_SECURITY_SHUTDOWN, 170, 124, 70, 14 + PUSHBUTTON "Change Password...", IDC_SECURITY_CHANGEPWD, 7, 143, 76, 14 + PUSHBUTTON "Oppgavebehandling", IDC_SECURITY_TASKMGR, 86, 143, 78, 14 PUSHBUTTON "Avbryt", IDCANCEL, 170, 143, 70, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer Locked" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 37, 61, 231, 8 - LTEXT "Message", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Press Ctrl-Alt-Del to unlock this computer.", IDC_STATIC, 37, 106, 231, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Unlock Computer" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "User name:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Password:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Change Password" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -103,26 +103,26 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Slå av ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Hva vil du at datamaskinen skal gjøre?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Avbryt", IDCANCEL, 204, 122, 55, 14 @@ -139,9 +139,9 @@ CAPTION "Slå av ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Hva vil du at datamaskinen skal gjøre?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -159,7 +159,7 @@ BEGIN // PUSHBUTTON "&Hjelp", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/pl-PL.rc b/dll/win32/msgina/lang/pl-PL.rc index b5fdfc7bb1..3c19402165 100644 --- a/dll/win32/msgina/lang/pl-PL.rc +++ b/dll/win32/msgina/lang/pl-PL.rc @@ -10,16 +10,16 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Proszę czekać..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Witamy w ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -29,71 +29,71 @@ BEGIN LTEXT "Proszę wcisnąć kombinację klawiszy Ctrl-Alt-Del", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Logowanie" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Nazwa użytkownika:", IDC_STATIC, 6, 60, 70, 8 - EDITTEXT IDC_USERNAME, 73, 57, 142, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 73, 57, 142, 14, ES_AUTOHSCROLL LTEXT "Hasło:", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 73, 76, 142, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 73, 76, 142, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Zaloguj do:", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 73, 95, 142, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 73, 95, 142, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Anuluj", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "Wyłącz", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "Wyłącz", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bezpieczeństwo" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Informacje o logowaniu", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Co chcesz teraz zrobić?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Zablokuj komputer", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "Wyloguj...", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "Wyłącz...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "Zmień hasło...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "Menedżer zadań", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "Zablokuj komputer", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "Wyloguj...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "Wyłącz...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "Zmień hasło...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "Menedżer zadań", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "Anuluj", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Blokada komputera" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Ten komputer jest używany i został zablokowany.", IDC_STATIC, 37, 61, 231, 8 - LTEXT "Wiadomość", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Naciśnij Ctrl-Alt-Del aby odblokować ten komputer.", IDC_STATIC, 37, 106, 231, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Odblokowanie komputera" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Ten komputer jest używany i został zablokowany.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Wiadomość", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "Nazwa użytkownika:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Hasło:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Anuluj", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Zmień hasło" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -113,26 +113,26 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "ReactOS - Wylogowywanie z systemu" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Czy na pewno chcesz się wylogować?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Tak", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Nie", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Zamknij ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Co chcesz, aby zrobił komputer?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Anuluj", IDCANCEL, 204, 122, 55, 14 @@ -149,9 +149,9 @@ CAPTION "Zamknij ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Co chcesz, aby zrobił komputer?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -169,7 +169,7 @@ BEGIN // PUSHBUTTON "&Pomoc", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index cfe7d0f5d5..bdbfc8a024 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -9,90 +9,90 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Așteptați…" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bun venit în ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "Apasați simultan «Ctrl»+«Alt»+«Del»", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Autentificare" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Nume utilizator:", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Parola:", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Vă autentificați la:", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Con&firmă", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "A&nulează", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "&Oprește", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "&Oprește", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Securitate" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Informații de autentificare", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Ce acțiune preferați?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "&Blochează calculatorul", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "&Deautentifică-mă…", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "Închid&e calculatorul…", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "Schim&bă parola…", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "&Gestionar de activități", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "&Blochează calculatorul", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "&Deautentifică-mă…", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "Închid&e calculatorul…", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "Schim&bă parola…", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "&Gestionar de activități", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "A&nulează", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Calculator blocat" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Acest calculator este în uz și a fost blocat.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Mesaj", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Apăsați simultan «Ctrl»+«Alt»+«Del» pentru a debloca acest calculator.", IDC_STATIC, 36, 106, 232, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Deblocare calculator" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Acest calculator este în uz și a fost blocat.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Mesaj", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "Nume utilizator:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Parola:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "Con&firmă", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "A&nulează", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Schimbare parolă" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -112,26 +112,26 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Deautentificare ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Sigur doriți să vă deautentificați?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "D&a", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "N&u", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Închidere ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Ce doriți să se întâmple?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "Con&firmă", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "A&nulează", IDCANCEL, 204, 122, 55, 14 @@ -148,9 +148,9 @@ CAPTION "Închidere ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Ce doriți să se întâmple?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -168,7 +168,7 @@ BEGIN // PUSHBUTTON "&Manual…", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index f221a1c55b..7672eb13d0 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -2,16 +2,16 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Пожалуйста, подождите..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Добро пожаловать в ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -21,71 +21,71 @@ BEGIN LTEXT "Нажмите клавиши Ctrl-Alt-Del.", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Вход" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Пользователь:", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Пароль:", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Войти в:", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Отмена", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "Выключение", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "Выключение", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Безопасность" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Информация о входе в систему", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Выберите необходимое действие:", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Заблокировать", IDC_LOCK, 7, 124, 84, 14 - PUSHBUTTON "Завершение сеанса...", IDC_LOGOFF, 96, 124, 84, 14 - PUSHBUTTON "Завершение работы...", IDC_SHUTDOWN, 184, 124, 84, 14 - PUSHBUTTON "Смена пароля...", IDC_CHANGEPWD, 7, 143, 84, 14 - PUSHBUTTON "Диспетчер задач", IDC_TASKMGR, 96, 143, 84, 14 + PUSHBUTTON "Заблокировать", IDC_SECURITY_LOCK, 7, 124, 84, 14 + PUSHBUTTON "Завершение сеанса...", IDC_SECURITY_LOGOFF, 96, 124, 84, 14 + PUSHBUTTON "Завершение работы...", IDC_SECURITY_SHUTDOWN, 184, 124, 84, 14 + PUSHBUTTON "Смена пароля...", IDC_SECURITY_CHANGEPWD, 7, 143, 84, 14 + PUSHBUTTON "Диспетчер задач", IDC_SECURITY_TASKMGR, 96, 143, 84, 14 PUSHBUTTON "Отмена", IDCANCEL, 184, 143, 84, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Компьютер заблокирован" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Этот компьютер используется и заблокирован.", IDC_STATIC, 37, 61, 231, 8 - LTEXT "Сообщение", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Нажмите Ctrl-Alt-Del, чтобы разблокировать компьютер.", IDC_STATIC, 37, 106, 231, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Разблокируйте компьютер" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Этот компьютер используется и заблокирован.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Сообщение", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "По&льзователь:", IDC_STATIC, 36, 107, 51, 8 - EDITTEXT IDC_USERNAME, 95, 104, 110, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 95, 104, 110, 14, ES_AUTOHSCROLL LTEXT "&Пароль:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 95, 123, 110, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 95, 123, 110, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Отмена", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Смена пароля" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -105,26 +105,26 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Выход из ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Вы уверены, что хотите выйти?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Да", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Нет", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Завершение работы ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Выберите желаемое действие:", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Отмена", IDCANCEL, 204, 122, 55, 14 @@ -141,9 +141,9 @@ CAPTION "Завершение работы ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Выберите желаемое действие:", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -161,7 +161,7 @@ BEGIN // PUSHBUTTON "&Справка", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/sk-SK.rc b/dll/win32/msgina/lang/sk-SK.rc index 6fb31af997..655251b568 100644 --- a/dll/win32/msgina/lang/sk-SK.rc +++ b/dll/win32/msgina/lang/sk-SK.rc @@ -5,16 +5,16 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Počkajte, prosím ..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Vitajte v systéme ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -24,71 +24,71 @@ BEGIN LTEXT "Stlačte kombináciu kláves Ctrl-Alt-Del", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Prihlásenie" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Meno používateľa:", IDC_STATIC, 6, 60, 59, 8 - EDITTEXT IDC_USERNAME, 67, 57, 148, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 67, 57, 148, 14, ES_AUTOHSCROLL LTEXT "Heslo:", IDC_STATIC, 6, 78, 59, 8 - EDITTEXT IDC_PASSWORD, 67, 76, 148, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 67, 76, 148, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Log on to:", IDC_STATIC, 6, 96, 59, 8 - COMBOBOX IDC_LOGON_TO, 67, 95, 148, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 67, 95, 148, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Zrušiť", IDCANCEL,160, 122, 50, 14 - PUSHBUTTON "Vypnúť", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "Vypnúť", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bezpečnosť" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Logon Information", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Čo chcete urobiť?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Uzamknúť počítač", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "Odhlásiť...", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "Vypnúť...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "Change Password...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "Správca úloh", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "Uzamknúť počítač", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "Odhlásiť...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "Vypnúť...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "Change Password...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "Správca úloh", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "Zrušiť", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer Locked" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 37, 61, 231, 8 - LTEXT "Message", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Press Ctrl-Alt-Del to unlock this computer.", IDC_STATIC, 37, 106, 231, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Unlock Computer" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "User name:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Password:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Change Password" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -108,26 +108,26 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Vypnutie systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Čo chcete aby počítač urobil?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Zrušiť", IDCANCEL, 204, 122, 55, 14 @@ -144,9 +144,9 @@ CAPTION "Vypnutie systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Čo chcete aby počítač urobil?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -164,7 +164,7 @@ BEGIN // PUSHBUTTON "&Pomocník", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/sq-AL.rc b/dll/win32/msgina/lang/sq-AL.rc index 4632414b93..cd3d7ee467 100644 --- a/dll/win32/msgina/lang/sq-AL.rc +++ b/dll/win32/msgina/lang/sq-AL.rc @@ -4,16 +4,16 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Ju Lutem Prisni..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Mirë se vini në ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -23,71 +23,71 @@ BEGIN LTEXT "Shtyp Ctrl-Alt-Del kombinimin butonave", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Hzr" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Përdoruesi:", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Fjalëkalimi:", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Anulo", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "Fikje", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "Fikje", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Siguria" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Informacionet Hzrese", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Çfarë doni të bëni?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Kyç kompjuterin", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "Dilni...", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "Fikje...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "Ndrysho Fjalëkalimin...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "Menaxhues detyrash", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "Kyç kompjuterin", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "Dilni...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "Fikje...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "Ndrysho Fjalëkalimin...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "Menaxhues detyrash", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "Anulo", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Kompjuteri u kyç" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Ky kompjuter është në përdorim dhe ka qenë i mbyllur.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Mesazhe", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Shtzp Ctrl-Alt-Del për të zhbllokuar këtë kompjuter.", IDC_STATIC, 36, 106, 232, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Zblloko Kompjuterin" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Ky kompjuter është në përdorim dhe ka qenë e mbyllur.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Mesazhe", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "Përdoruesi:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Fjalëkalimi:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Anulo", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Ndrysho Fjalëkalimin" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -107,26 +107,26 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Dil nga ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Jeni te sigurte qe doni te dilni?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Po", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Jo", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Shut Down ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Anulo", IDCANCEL, 204, 122, 55, 14 @@ -143,9 +143,9 @@ CAPTION "Shut Down ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -163,7 +163,7 @@ BEGIN // PUSHBUTTON "&Ndihmë", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/tr-TR.rc b/dll/win32/msgina/lang/tr-TR.rc index 2dfd76866e..b3e75f3607 100644 --- a/dll/win32/msgina/lang/tr-TR.rc +++ b/dll/win32/msgina/lang/tr-TR.rc @@ -2,90 +2,90 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Lütfen Bekleyiniz..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ReactOS'a Hoşgeldiniz" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Başlamak için Denetim, Seçenek ve Silme düğmelerine birlikte basınız.",IDC_STATIC, 38, 60, 230, 14 + LTEXT "Başlamak için Denetim, Seçenek ve Silme düğmelerine birlikte basınız.", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Oturum Aç" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Kullanıcı Adı:", IDC_STATIC, 6, 60, 59, 8 - EDITTEXT IDC_USERNAME, 67, 57, 148, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 67, 57, 148, 14, ES_AUTOHSCROLL LTEXT "Şifre:", IDC_STATIC, 6, 78, 59, 8 - EDITTEXT IDC_PASSWORD, 67, 76, 148, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 67, 76, 148, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Üzerinde Oturum Aç:", IDC_STATIC, 6, 96, 59, 8 - COMBOBOX IDC_LOGON_TO, 67, 95, 148, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 67, 95, 148, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Tamam", IDOK, 91, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "İptal", IDCANCEL, 145, 122, 50, 14 - PUSHBUTTON "Bilgisayarı Kapat", IDC_SHUTDOWN, 199, 122, 65, 14 + PUSHBUTTON "Bilgisayarı Kapat", IDC_LOGON_SHUTDOWN, 199, 122, 65, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Güvenlik" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Oturum Açma Bilgisi", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Ne yapmak istersiniz?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Bilgisayarı Kilitle", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "Oturumu Kapat...", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "Bilgisayarı Kapat...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "Şifre Değiştir...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "Görev Yöneticisi", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "Bilgisayarı Kilitle", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "Oturumu Kapat...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "Bilgisayarı Kapat...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "Şifre Değiştir...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "Görev Yöneticisi", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "İptal", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bilgisayar Kilitli" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Bu bilgisayar kullanımda ve kilitli.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "İleti", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Bu bilgisayarın kilidini açmak için Denetim, Seçenek ve Silme düğmelerine birlikte basınız.", IDC_STATIC, 36, 106, 232, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bilgisayarın Kilidini Aç" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "Bu bilgisayar kullanımda ve kilitli.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "İleti", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "Kullanıcı Adı:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Şifre:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "Tamam", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "İptal", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Şifre Değiştir" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -105,26 +105,26 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Oturumu Kapat" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Oturumu kapatmayı istediğinizden emin misiniz?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Evet", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Hayır", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Bilgisayarı Kapat" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Bilgisayarın ne yapmasını istiyorsunuz?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "Tamam", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "İptal", IDCANCEL, 204, 122, 55, 14 @@ -141,9 +141,9 @@ CAPTION "Bilgisayarı Kapat" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Bilgisayarın ne yapmasını istiyorsunuz?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -161,7 +161,7 @@ BEGIN // PUSHBUTTON "&Yardım", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/uk-UA.rc b/dll/win32/msgina/lang/uk-UA.rc index ab89f18ca6..68956efb2a 100644 --- a/dll/win32/msgina/lang/uk-UA.rc +++ b/dll/win32/msgina/lang/uk-UA.rc @@ -8,16 +8,16 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Зачекайте..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Ласкаво просимо до ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -27,71 +27,71 @@ BEGIN LTEXT "Натисніть клавіші Ctrl+Alt+Del", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Вхід" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "Користувач:", IDC_STATIC, 6, 60, 40, 8 - EDITTEXT IDC_USERNAME, 54, 57, 159, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 54, 57, 159, 14, ES_AUTOHSCROLL LTEXT "Пароль:",IDC_STATIC, 6, 78, 42, 8 - EDITTEXT IDC_PASSWORD, 54, 76, 159, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 54, 76, 159, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "Log on to:", IDC_STATIC, 6, 96, 42, 8 - COMBOBOX IDC_LOGON_TO, 54, 95, 159, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 54, 95, 159, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Скасувати", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "Завершення роботи...", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "Завершення роботи...", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Безпека" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Logon Information", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "Що Ви хочете зробити?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "Блокування", IDC_LOCK, 7, 124, 84, 14 - PUSHBUTTON "Вихід із системи...", IDC_LOGOFF, 96, 124, 84, 14 - PUSHBUTTON "Завершення роботи...", IDC_SHUTDOWN, 184, 124, 84, 14 - PUSHBUTTON "Change Password...", IDC_CHANGEPWD, 7, 143, 84, 14 - PUSHBUTTON "Диспетчер завдань", IDC_TASKMGR, 96, 143, 84, 14 + PUSHBUTTON "Блокування", IDC_SECURITY_LOCK, 7, 124, 84, 14 + PUSHBUTTON "Вихід із системи...", IDC_SECURITY_LOGOFF, 96, 124, 84, 14 + PUSHBUTTON "Завершення роботи...", IDC_SECURITY_SHUTDOWN, 184, 124, 84, 14 + PUSHBUTTON "Change Password...", IDC_SECURITY_CHANGEPWD, 7, 143, 84, 14 + PUSHBUTTON "Диспетчер завдань", IDC_SECURITY_TASKMGR, 96, 143, 84, 14 PUSHBUTTON "Скасувати", IDCANCEL, 184, 143, 84, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer Locked" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "Press Ctrl-Alt-Del to unlock this computer.", IDC_STATIC, 36, 106, 232, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Unlock Computer" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "This computer is in use and has been locked.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "User name:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Password:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Change Password" FONT 8, "MS Shell Dlg", 400, 0, 1 @@ -111,26 +111,26 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Завершення роботи ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Виберіть одну з таких можливостей?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Скасувати", IDCANCEL, 204, 122, 55, 14 @@ -147,9 +147,9 @@ CAPTION "Завершення роботи ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Виберіть одну з таких можливостей?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -167,7 +167,7 @@ BEGIN // PUSHBUTTON "&Довідка", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" diff --git a/dll/win32/msgina/lang/zh-CN.rc b/dll/win32/msgina/lang/zh-CN.rc index 87f36dd8b6..50446c4770 100644 --- a/dll/win32/msgina/lang/zh-CN.rc +++ b/dll/win32/msgina/lang/zh-CN.rc @@ -3,90 +3,90 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "请稍候..." FONT 9, "宋体", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "欢迎使用 ReactOS" FONT 9, "宋体", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "按 Ctrl-Alt-Delete 开始。",IDC_STATIC, 38, 60, 230, 14 + LTEXT "按 Ctrl-Alt-Delete 开始。", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "登录" FONT 9, "宋体", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "用户名:", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "密码:", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "登录到:", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "确定",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "取消", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "关闭", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "关闭", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "安全" FONT 9, "宋体", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "登录信息", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "你想要做什么?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "锁定计算机(&K)", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "注销(&L)...", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "关闭(&S)...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "更改密码(&C)...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "任务管理器(&T)", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "锁定计算机(&K)", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "注销(&L)...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "关闭(&S)...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "更改密码(&C)...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "任务管理器(&T)", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "取消", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "计算机已锁定" FONT 9, "宋体", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "此计算机正在使用，已被锁定。", IDC_STATIC, 36, 61, 232, 8 - LTEXT "消息", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "请按 Ctrl-Alt-Del 解除本机锁定。", IDC_STATIC, 36, 106, 232, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "解除计算机锁定" FONT 9, "宋体", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "此计算机正在使用，并被锁定。", IDC_STATIC, 36, 61, 232, 8 - LTEXT "消息", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "用户名:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "密码:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "确定", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "取消", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "更改密码" FONT 9, "宋体", 400, 0, 1 @@ -106,26 +106,26 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "注销 ReactOS" FONT 9, "宋体", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "确实要注销吗?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "是", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "否", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "关闭 ReactOS" FONT 9, "宋体" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "你想让计算机做什么?(&W)", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "确定", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "取消", IDCANCEL, 204, 122, 55, 14 @@ -142,9 +142,9 @@ CAPTION "关闭 ReactOS" FONT 9, "宋体" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "你想让计算机做什么?(&W)", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -162,7 +162,7 @@ BEGIN // PUSHBUTTON "帮助(&H)", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 9, "宋体" diff --git a/dll/win32/msgina/lang/zh-TW.rc b/dll/win32/msgina/lang/zh-TW.rc index 6d186eba47..c6f6d5940c 100644 --- a/dll/win32/msgina/lang/zh-TW.rc +++ b/dll/win32/msgina/lang/zh-TW.rc @@ -2,90 +2,90 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "請稍候..." FONT 9, "新細明體", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "歡迎來到 ReactOS" FONT 9, "新細明體", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "按 Ctrl-Alt-Delete 開始。",IDC_STATIC, 38, 60, 230, 14 + LTEXT "按 Ctrl-Alt-Delete 開始。", IDC_STATIC, 38, 60, 230, 14 END -IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 +IDD_LOGON DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "登入" FONT 9, "新細明體", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "使用者名:", IDC_STATIC, 6, 60, 52, 8 - EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "密碼:", IDC_STATIC, 6, 78, 52, 8 - EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_LOGON_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD LTEXT "登入到:", IDC_STATIC, 6, 96, 52, 8 - COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LOGON_DOMAIN, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "確定",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "取消", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "關閉", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "關閉", IDC_LOGON_SHUTDOWN, 214, 122, 50, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 164 +IDD_SECURITY DIALOGEX 0, 0, 275, 164 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "安全" FONT 9, "新細明體", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "登入資訊", IDC_STATIC, 7, 50, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 62, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 83, 245, 8 + LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 + LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "你想要做什麼?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "鎖定計算機", IDC_LOCK, 7, 124, 80, 14 - PUSHBUTTON "登出...", IDC_LOGOFF, 98, 124, 80, 14 - PUSHBUTTON "關閉...", IDC_SHUTDOWN, 188, 124, 80, 14 - PUSHBUTTON "更改密碼...", IDC_CHANGEPWD, 7, 143, 80, 14 - PUSHBUTTON "工作管理員", IDC_TASKMGR, 98, 143, 80, 14 + PUSHBUTTON "鎖定計算機", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "登出...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 + PUSHBUTTON "關閉...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 + PUSHBUTTON "更改密碼...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 + PUSHBUTTON "工作管理員", IDC_SECURITY_TASKMGR, 98, 143, 80, 14 PUSHBUTTON "取消", IDCANCEL, 188, 143, 80, 14 END -IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 +IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "鎖定計算機" FONT 9, "新細明體", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "此計算機正在使用中，已被鎖定。", IDC_STATIC, 36, 61, 232, 8 - LTEXT "訊息", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 LTEXT "按 Ctrl-Alt-Del 鍵解鎖此計算機。", IDC_STATIC, 36, 106, 232, 8 END -IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 +IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "解除鎖定計算機" FONT 9, "新細明體", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, -1, 7, 59, 20, 20 + ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 LTEXT "此計算機正在使用中，已被鎖定。", IDC_STATIC, 36, 61, 232, 8 - LTEXT "訊息", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "使用者名稱:", IDC_STATIC, 36, 107, 40, 8 - EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL + EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "密碼:", IDC_STATIC, 36, 125, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD + EDITTEXT IDC_UNLOCK_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "確定", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "取消", IDCANCEL, 144, 154, 50, 14 END -IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 +IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "更改密碼" FONT 9, "新細明體", 400, 0, 1 @@ -105,26 +105,26 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 218, 145, 50, 14 END -IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +IDD_LOGOFF DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "ReactOS 登出" FONT 9, "新細明體", 400, 0, 1 BEGIN - ICON IDI_LOGOFF, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, IDC_STATIC, 7, 7, 20, 20 LTEXT "你確定你想要登出?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "是", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "否", IDNO, 95, 39, 50, 14 END -IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "關閉 ReactOS" FONT 9, "新細明體" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "你想讓計算機做什麼?(&W)", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "確定", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "取消", IDCANCEL, 204, 122, 55, 14 @@ -141,9 +141,9 @@ CAPTION "關閉 ReactOS" FONT 9, "新細明體" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "你想讓計算機做什麼?(&W)", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 @@ -161,7 +161,7 @@ BEGIN // PUSHBUTTON "幫助(&H)", IDHELP, 211, 276, 55, 14 END -IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +IDD_LEGALNOTICE DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 9, "新細明體" diff --git a/dll/win32/msgina/resource.h b/dll/win32/msgina/resource.h index ffee4c59d1..49ae3a8c44 100644 --- a/dll/win32/msgina/resource.h +++ b/dll/win32/msgina/resource.h @@ -1,47 +1,60 @@ #pragma once -#define IDC_STATIC -1 -#define IDD_STATUSWINDOW_DLG 100 -#define IDD_NOTICE_DLG 101 -#define IDD_LOGGEDON_DLG 102 -#define IDD_LOGGEDOUT_DLG 103 -#define IDD_LOCKED_DLG 104 -#define IDD_UNLOCK_DLG 105 -#define IDD_SHUTDOWN_DLG 108 -#define IDD_SHUTDOWN_FANCY 109 -#define IDD_SHUTDOWN_REASON 110 - -#define IDC_LOGOFF 1001 -#define IDC_USERNAME 1002 -#define IDC_PASSWORD 1003 -#define IDC_SHUTDOWN 1004 -#define IDC_STATUSLABEL 1005 -#define IDC_LOCK 1006 +#define IDC_STATIC -1 + +#define IDD_STATUS 1000 +#define IDC_STATUS_MESSAGE 1001 + +#define IDD_WELCOME 1100 +#define IDC_WELCOME_HELP 1101 + +#define IDD_LOGON 1200 +#define IDC_LOGON_USERNAME 1201 +#define IDC_LOGON_PASSWORD 1202 +#define IDC_LOGON_DOMAIN 1203 +#define IDC_LOGON_SHUTDOWN 1204 + +#define IDD_SECURITY 1300 +#define IDC_SECURITY_MESSAGE 1301 +#define IDC_SECURITY_LOGONDATE 1302 +#define IDC_SECURITY_LOCK 1303 +#define IDC_SECURITY_LOGOFF 1304 +#define IDC_SECURITY_SHUTDOWN 1305 +#define IDC_SECURITY_CHANGEPWD 1306 +#define IDC_SECURITY_TASKMGR 1307 + +#define IDD_LOCKED 1400 +#define IDC_LOCKED_MESSAGE 1401 + +#define IDD_UNLOCK 1500 +#define IDC_UNLOCK_MESSAGE 1501 +#define IDC_UNLOCK_USERNAME 1502 +#define IDC_UNLOCK_PASSWORD 1503 + +#define IDD_CHANGEPWD 1600 +#define IDC_CHANGEPWD_USERNAME 1601 +#define IDC_CHANGEPWD_DOMAIN 1602 +#define IDC_CHANGEPWD_OLDPWD 1603 +#define IDC_CHANGEPWD_NEWPWD1 1604 +#define IDC_CHANGEPWD_NEWPWD2 1605 + +#define IDD_LOGOFF 1700 + +#define IDD_SHUTDOWN 1800 +#define IDD_SHUTDOWN_FANCY 1900 +#define IDD_SHUTDOWN_REASON 2000 + +#define IDC_SHUTDOWN_ACTION 2001 +#define IDC_SHUTDOWN_DESCRIPTION 2002 +#define IDC_REASON_PLANNED 2003 +#define IDC_REASON_LIST 2004 +#define IDC_REASON_DESCRIPTION 2005 +#define IDC_REASON_COMMENT 2006 + +#define IDD_LEGALNOTICE 2100 +#define IDC_LEGALNOTICE_TEXT 2101 + #define IDC_ROSLOGO 1007 -#define IDC_TASKMGR 1008 -#define IDC_LOCKMSG 1009 -#define IDC_LOGONMSG 1010 -#define IDC_LOGONDATE 1011 -#define IDC_CHANGEPWD 1012 -#define IDC_LOGON_TO 1013 -#define IDC_SHUTDOWN_LIST 1014 -#define IDC_SHUTDOWN_DESCRIPTION 1015 -#define IDC_REASON_PLANNED 1016 -#define IDC_REASON_LIST 1017 -#define IDC_REASON_DESCRIPTION 1018 -#define IDC_REASON_COMMENT 1019 - -#define IDD_CHANGE_PASSWORD 106 -#define IDC_CHANGEPWD_USERNAME 1013 -#define IDC_CHANGEPWD_DOMAIN 1014 -#define IDC_CHANGEPWD_OLDPWD 1015 -#define IDC_CHANGEPWD_NEWPWD1 1016 -#define IDC_CHANGEPWD_NEWPWD2 1017 - -#define IDD_LOGOFF_DLG 107 - -#define IDD_LEGALNOTICE_DLG 1018 -#define IDC_LEGALNOTICE_TEXT 1019 #define IDI_ROSLOGO 20000 diff --git a/dll/win32/msgina/shutdown.c b/dll/win32/msgina/shutdown.c index e6f18e302f..01e397cbce 100644 --- a/dll/win32/msgina/shutdown.c +++ b/dll/win32/msgina/shutdown.c @@ -249,11 +249,11 @@ UpdateShutdownDesc( DWORD ShutdownCode; WCHAR szBuffer[256]; - ShutdownCode = SendDlgItemMessageW(hDlg, IDC_SHUTDOWN_LIST, CB_GETCURSEL, 0, 0); + ShutdownCode = SendDlgItemMessageW(hDlg, IDC_SHUTDOWN_ACTION, CB_GETCURSEL, 0, 0); if (ShutdownCode == CB_ERR) // Invalid selection return; - ShutdownCode = SendDlgItemMessageW(hDlg, IDC_SHUTDOWN_LIST, CB_GETITEMDATA, ShutdownCode, 0); + ShutdownCode = SendDlgItemMessageW(hDlg, IDC_SHUTDOWN_ACTION, CB_GETITEMDATA, ShutdownCode, 0); switch (ShutdownCode) { @@ -303,7 +303,7 @@ ShutdownOnInit( WCHAR szBuffer[256]; WCHAR szBuffer2[256]; - hwndList = GetDlgItem(hDlg, IDC_SHUTDOWN_LIST); + hwndList = GetDlgItem(hDlg, IDC_SHUTDOWN_ACTION); /* Clear the content before it's used */ SendMessageW(hwndList, CB_RESETCONTENT, 0, 0); @@ -383,7 +383,7 @@ ShutdownOnOk( INT idx; idx = SendDlgItemMessageW(hDlg, - IDC_SHUTDOWN_LIST, + IDC_SHUTDOWN_ACTION, CB_GETCURSEL, 0, 0); @@ -391,7 +391,7 @@ ShutdownOnOk( { pgContext->nShutdownAction = SendDlgItemMessageW(hDlg, - IDC_SHUTDOWN_LIST, + IDC_SHUTDOWN_ACTION, CB_GETITEMDATA, idx, 0); @@ -477,7 +477,7 @@ ShutdownDialogProc( EndDialog(hDlg, LOWORD(wParam)); break; - case IDC_SHUTDOWN_LIST: + case IDC_SHUTDOWN_ACTION: UpdateShutdownDesc(hDlg, pContext); break; } @@ -515,7 +515,7 @@ ShutdownDialog( { ret = pgContext->pWlxFuncs->WlxDialogBoxParam(pgContext->hWlx, pgContext->hDllInstance, - MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : IDD_SHUTDOWN_DLG), + MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : IDD_SHUTDOWN), hwndDlg, ShutdownDialogProc, (LPARAM)&Context); @@ -523,7 +523,7 @@ ShutdownDialog( else { ret = DialogBoxParamW(pgContext->hDllInstance, - MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : IDD_SHUTDOWN_DLG), + MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : IDD_SHUTDOWN), hwndDlg, ShutdownDialogProc, (LPARAM)&Context);

1 0

01/01: [NTOSKRNL] Implement KeQueryValuesProcess().
by Pierre Schweitzer 25 May '18

25 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f15afdbc43c078bb53e7b… commit f15afdbc43c078bb53e7b9d7a82aacf2ec0a9cd4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri May 25 21:40:39 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri May 25 21:40:39 2018 +0200 [NTOSKRNL] Implement KeQueryValuesProcess(). And make use of it. --- ntoskrnl/include/internal/ke.h | 12 ++++++++++ ntoskrnl/ke/procobj.c | 52 ++++++++++++++++++++++++++++++++++++++++++ ntoskrnl/ps/job.c | 21 +++++++++-------- ntoskrnl/ps/query.c | 12 ++++------ 4 files changed, 80 insertions(+), 17 deletions(-) diff --git a/ntoskrnl/include/internal/ke.h b/ntoskrnl/include/internal/ke.h index f2c32fb266..7bdd97fd8e 100644 --- a/ntoskrnl/include/internal/ke.h +++ b/ntoskrnl/include/internal/ke.h @@ -36,6 +36,13 @@ typedef struct _DISPATCH_INFO PKINTERRUPT_ROUTINE *FlatDispatch; } DISPATCH_INFO, *PDISPATCH_INFO; +typedef struct _PROCESS_VALUES +{ + LARGE_INTEGER TotalKernelTime; + LARGE_INTEGER TotalUserTime; + IO_COUNTERS IoInfo; +} PROCESS_VALUES, *PPROCESS_VALUES; + typedef struct _DEFERRED_REVERSE_BARRIER { ULONG Barrier; @@ -710,6 +717,11 @@ NTAPI KeQueryRuntimeProcess(IN PKPROCESS Process, OUT PULONG UserTime); +VOID +NTAPI +KeQueryValuesProcess(IN PKPROCESS Process, + PPROCESS_VALUES Values); + /* INITIALIZATION FUNCTIONS *************************************************/ BOOLEAN diff --git a/ntoskrnl/ke/procobj.c b/ntoskrnl/ke/procobj.c index a448202f38..865d7881f8 100644 --- a/ntoskrnl/ke/procobj.c +++ b/ntoskrnl/ke/procobj.c @@ -517,6 +517,58 @@ KeSetPriorityAndQuantumProcess(IN PKPROCESS Process, return OldPriority; } +VOID +NTAPI +KeQueryValuesProcess(IN PKPROCESS Process, + PPROCESS_VALUES Values) +{ + PEPROCESS EProcess; + PLIST_ENTRY NextEntry; + ULONG TotalKernel, TotalUser; + KLOCK_QUEUE_HANDLE ProcessLock; + + ASSERT_PROCESS(Process); + ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + + /* Lock the process */ + KiAcquireProcessLock(Process, &ProcessLock); + + /* Initialize user and kernel times */ + TotalKernel = Process->KernelTime; + TotalUser = Process->UserTime; + + /* Copy the IO_COUNTERS from the process */ + EProcess = (PEPROCESS)Process; + Values->IoInfo.ReadOperationCount = EProcess->ReadOperationCount.QuadPart; + Values->IoInfo.WriteOperationCount = EProcess->WriteOperationCount.QuadPart; + Values->IoInfo.OtherOperationCount = EProcess->OtherOperationCount.QuadPart; + Values->IoInfo.ReadTransferCount = EProcess->ReadTransferCount.QuadPart; + Values->IoInfo.WriteTransferCount = EProcess->WriteTransferCount.QuadPart; + Values->IoInfo.OtherTransferCount = EProcess->OtherTransferCount.QuadPart; + + /* Loop all child threads and sum up their times */ + for (NextEntry = Process->ThreadListHead.Flink; + NextEntry != &Process->ThreadListHead; + NextEntry = NextEntry->Flink) + { + PKTHREAD Thread; + + /* Get the thread */ + Thread = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); + + /* Sum up times */ + TotalKernel += Thread->KernelTime; + TotalUser += Thread->UserTime; + } + + /* Release the process lock */ + KiReleaseProcessLock(&ProcessLock); + + /* Compute total times */ + Values->TotalKernelTime.QuadPart = TotalKernel * (LONGLONG)KeMaximumIncrement; + Values->TotalUserTime.QuadPart = TotalUser * (LONGLONG)KeMaximumIncrement; +} + /* PUBLIC FUNCTIONS **********************************************************/ /* diff --git a/ntoskrnl/ps/job.c b/ntoskrnl/ps/job.c index 141398be15..fd0049c991 100644 --- a/ntoskrnl/ps/job.c +++ b/ntoskrnl/ps/job.c @@ -631,16 +631,17 @@ NtQueryInformationJobObject ( Process = CONTAINING_RECORD(NextEntry, EPROCESS, JobLinks); if (!BooleanFlagOn(Process->JobStatus, 2)) { - /* FIXME: Call KeQueryValuesProcess() - * We should sum BasicInfo values here, - * but we don't have them - */ - BasicAndIo.IoInfo.ReadOperationCount += Process->ReadOperationCount.QuadPart; - BasicAndIo.IoInfo.WriteOperationCount += Process->WriteOperationCount.QuadPart; - BasicAndIo.IoInfo.OtherOperationCount += Process->OtherOperationCount.QuadPart; - BasicAndIo.IoInfo.ReadTransferCount += Process->ReadTransferCount.QuadPart; - BasicAndIo.IoInfo.WriteTransferCount += Process->WriteTransferCount.QuadPart; - BasicAndIo.IoInfo.OtherTransferCount += Process->OtherTransferCount.QuadPart; + PROCESS_VALUES Values; + + KeQueryValuesProcess(&Process->Pcb, &Values); + BasicAndIo.BasicInfo.TotalUserTime.QuadPart += Values.TotalUserTime.QuadPart; + BasicAndIo.BasicInfo.TotalKernelTime.QuadPart += Values.TotalKernelTime.QuadPart; + BasicAndIo.IoInfo.ReadOperationCount += Values.IoInfo.ReadOperationCount; + BasicAndIo.IoInfo.WriteOperationCount += Values.IoInfo.WriteOperationCount; + BasicAndIo.IoInfo.OtherOperationCount += Values.IoInfo.OtherOperationCount; + BasicAndIo.IoInfo.ReadTransferCount += Values.IoInfo.ReadTransferCount; + BasicAndIo.IoInfo.WriteTransferCount += Values.IoInfo.WriteTransferCount; + BasicAndIo.IoInfo.OtherTransferCount += Values.IoInfo.OtherTransferCount; } } diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index 40a365a253..7a1767d54f 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -82,6 +82,7 @@ NtQueryInformationProcess(IN HANDLE ProcessHandle, PUNICODE_STRING ImageName; ULONG Cookie, ExecuteOptions = 0; ULONG_PTR Wow64 = 0; + PROCESS_VALUES ProcessValues; PAGED_CODE(); /* Check for user-mode caller */ @@ -251,15 +252,12 @@ NtQueryInformationProcess(IN HANDLE ProcessHandle, NULL); if (!NT_SUCCESS(Status)) break; + /* Query IO counters from the process */ + KeQueryValuesProcess(&Process->Pcb, &ProcessValues); + _SEH2_TRY { - /* FIXME: Call KeQueryValuesProcess */ - IoCounters->ReadOperationCount = Process->ReadOperationCount.QuadPart; - IoCounters->ReadTransferCount = Process->ReadTransferCount.QuadPart; - IoCounters->WriteOperationCount = Process->WriteOperationCount.QuadPart; - IoCounters->WriteTransferCount = Process->WriteTransferCount.QuadPart; - IoCounters->OtherOperationCount = Process->OtherOperationCount.QuadPart; - IoCounters->OtherTransferCount = Process->OtherTransferCount.QuadPart; + RtlCopyMemory(IoCounters, &ProcessValues.IoInfo, sizeof(IO_COUNTERS)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

05/05: [NTOSKRNL] Make NtSetInformationJobObject() success for JobObjectExtendedLimitInformation
by Pierre Schweitzer 25 May '18

25 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0b74378823fc56581edb… commit b0b74378823fc56581edbf6a76c9ca158236ae83 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri May 25 08:46:19 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri May 25 08:48:51 2018 +0200 [NTOSKRNL] Make NtSetInformationJobObject() success for JobObjectExtendedLimitInformation This fixes pip from Python 2.7.9 starting in ReactOS. Though it doesn't work due to TLS issues. --- ntoskrnl/ps/job.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ps/job.c b/ntoskrnl/ps/job.c index d64864db20..141398be15 100644 --- a/ntoskrnl/ps/job.c +++ b/ntoskrnl/ps/job.c @@ -754,8 +754,90 @@ NtSetInformationJobObject ( PVOID JobInformation, ULONG JobInformationLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PEJOB Job; + NTSTATUS Status; + PKTHREAD CurrentThread; + ACCESS_MASK DesiredAccess; + KPROCESSOR_MODE PreviousMode; + ULONG RequiredLength, RequiredAlign; + + PAGED_CODE(); + + CurrentThread = KeGetCurrentThread(); + + /* Validate class */ + if (JobInformationClass > JobObjectJobSetInformation || JobInformationClass < JobObjectBasicAccountingInformation) + { + return STATUS_INVALID_INFO_CLASS; + } + + /* Get associated lengths & alignments */ + RequiredLength = PspJobInfoLengths[JobInformationClass]; + RequiredAlign = PspJobInfoAlign[JobInformationClass]; + + PreviousMode = ExGetPreviousMode(); + /* If not comming from umode, we need to probe buffers */ + if (PreviousMode != KernelMode) + { + ASSERT(((RequiredAlign) == 1) || ((RequiredAlign) == 2) || ((RequiredAlign) == 4) || ((RequiredAlign) == 8) || ((RequiredAlign) == 16)); + + _SEH2_TRY + { + /* Probe out buffer for read */ + if (JobInformationLength != 0) + { + ProbeForRead(JobInformation, JobInformationLength, RequiredAlign); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + + /* Validate input size */ + if (JobInformationLength != RequiredLength) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Open the given job */ + DesiredAccess = JOB_OBJECT_SET_ATTRIBUTES; + if (JobInformationClass == JobObjectSecurityLimitInformation) + { + DesiredAccess |= JOB_OBJECT_SET_SECURITY_ATTRIBUTES; + } + Status = ObReferenceObjectByHandle(JobHandle, + DesiredAccess, + PsJobType, + PreviousMode, + (PVOID*)&Job, + NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* And set the information */ + KeEnterGuardedRegionThread(CurrentThread); + switch (JobInformationClass) + { + case JobObjectExtendedLimitInformation: + DPRINT1("Class JobObjectExtendedLimitInformation not implemented\n"); + Status = STATUS_SUCCESS; + break; + + default: + DPRINT1("Class %d not implemented\n", JobInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + KeLeaveGuardedRegionThread(CurrentThread); + + ObfDereferenceObject(Job); + + return Status; }

1 0

04/05: [NTOSKRNL] Define required sizes with structures sizes
by Pierre Schweitzer 25 May '18

25 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f300ca7245b6cbb41a74c… commit f300ca7245b6cbb41a74cf8b46362fa6bae3f04f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri May 25 08:14:44 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri May 25 08:48:51 2018 +0200 [NTOSKRNL] Define required sizes with structures sizes --- ntoskrnl/ps/job.c | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/ps/job.c b/ntoskrnl/ps/job.c index 7b242c6d60..d64864db20 100644 --- a/ntoskrnl/ps/job.c +++ b/ntoskrnl/ps/job.c @@ -50,6 +50,36 @@ GENERIC_MAPPING PspJobMapping = STANDARD_RIGHTS_ALL | THREAD_ALL_ACCESS // bug fixed only in vista }; +ULONG PspJobInfoLengths[] = +{ + 0x0, + sizeof(JOBOBJECT_BASIC_ACCOUNTING_INFORMATION), + sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION), + sizeof(JOBOBJECT_BASIC_PROCESS_ID_LIST), + sizeof(JOBOBJECT_BASIC_UI_RESTRICTIONS), + sizeof(JOBOBJECT_SECURITY_LIMIT_INFORMATION), + sizeof(JOBOBJECT_END_OF_JOB_TIME_INFORMATION), + sizeof(JOBOBJECT_ASSOCIATE_COMPLETION_PORT), + sizeof(JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION), + sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION), + 0x4 +}; + +ULONG PspJobInfoAlign[] = +{ + 0x0, + sizeof(ULONG), + sizeof(ULONG), + sizeof(ULONG), + sizeof(ULONG), + sizeof(ULONG), + sizeof(ULONG), + sizeof(ULONG), + sizeof(ULONG), + sizeof(ULONG), + sizeof(ULONG) +}; + /* FUNCTIONS *****************************************************************/ VOID @@ -447,13 +477,6 @@ NtOpenJobObject ( } -ULONG PspJobInfoLengths[] = { 0x0, sizeof(JOBOBJECT_BASIC_ACCOUNTING_INFORMATION), - sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION), - 0x0C, 0x4, 0x14, 0x4, 0x8, - sizeof(JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION), - sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION), 0x4 }; -ULONG PspJobInfoAlign[] = { 0x0, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4 }; - /* * @implemented */

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
22
Older →

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 May 2018