Ros-diffs February 2021

ros-diffs@reactos.org

30 participants
434 discussions

[reactos] 02/03: [NTOS:MM] Do not assert on a case we actually support
by Jérôme Gardou 10 Feb '21

10 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0573de22a02b9d87b48bf… commit 0573de22a02b9d87b48bfd2b9d6433f476e80a34 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Feb 10 15:21:00 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 10 17:48:30 2021 +0100 [NTOS:MM] Do not assert on a case we actually support --- ntoskrnl/mm/ARM3/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index 00271e03e7b..6234e58d7be 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -5035,7 +5035,7 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle, if (PointerPte->u.Soft.Valid == 0) { ASSERT(PointerPte->u.Soft.Prototype == 0); - ASSERT(PointerPte->u.Soft.PageFileHigh == 0); + ASSERT((PointerPte->u.Soft.PageFileHigh == 0) || (PointerPte->u.Soft.Transition == 1)); } //

1 0

[reactos] 01/03: [CONSRV] Set 0 as a console leader PID/TID when unsetting it.
by Jérôme Gardou 10 Feb '21

10 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f12e6016b6882a14b21ee… commit f12e6016b6882a14b21ee86e708a28179885b630 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Feb 10 15:09:48 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 10 17:48:30 2021 +0100 [CONSRV] Set 0 as a console leader PID/TID when unsetting it. Instead of whatever is behind the NULL pointer. --- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c index de9eea6053a..6dc4249dbe8 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c @@ -48,14 +48,25 @@ VOID SetConWndConsoleLeaderCID(IN PGUI_CONSOLE_DATA GuiData) { PCONSOLE_PROCESS_DATA ProcessData; - CLIENT_ID ConsoleLeaderCID; ProcessData = ConSrvGetConsoleLeaderProcess(GuiData->Console); - ConsoleLeaderCID = ProcessData->Process->ClientId; - SetWindowLongPtrW(GuiData->hWindow, GWLP_CONSOLE_LEADER_PID, - (LONG_PTR)(ConsoleLeaderCID.UniqueProcess)); - SetWindowLongPtrW(GuiData->hWindow, GWLP_CONSOLE_LEADER_TID, - (LONG_PTR)(ConsoleLeaderCID.UniqueThread)); + + DPRINT("ProcessData: %p, ProcessData->Process %p.\n", ProcessData, ProcessData->Process); + ASSERT(ProcessData != NULL); + + if (ProcessData->Process) + { + CLIENT_ID ConsoleLeaderCID = ProcessData->Process->ClientId; + SetWindowLongPtrW(GuiData->hWindow, GWLP_CONSOLE_LEADER_PID, + (LONG_PTR)(ConsoleLeaderCID.UniqueProcess)); + SetWindowLongPtrW(GuiData->hWindow, GWLP_CONSOLE_LEADER_TID, + (LONG_PTR)(ConsoleLeaderCID.UniqueThread)); + } + else + { + SetWindowLongPtrW(GuiData->hWindow, GWLP_CONSOLE_LEADER_PID, 0); + SetWindowLongPtrW(GuiData->hWindow, GWLP_CONSOLE_LEADER_TID, 0); + } } /**************************************************************/

1 0

[reactos] 01/01: [NTOS:MM] Flush dirty pages after closing the page files.
by Jérôme Gardou 10 Feb '21

10 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73fd52a164ac9f2cc5046… commit 73fd52a164ac9f2cc50462295ec2f5eb23450a25 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Feb 10 11:06:44 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 10 11:14:19 2021 +0100 [NTOS:MM] Flush dirty pages after closing the page files. CORE-17462 --- ntoskrnl/mm/shutdown.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/ntoskrnl/mm/shutdown.c b/ntoskrnl/mm/shutdown.c index 89beca88fac..1d08a4f4166 100644 --- a/ntoskrnl/mm/shutdown.c +++ b/ntoskrnl/mm/shutdown.c @@ -24,8 +24,20 @@ MiShutdownSystem(VOID) PFN_NUMBER Page; BOOLEAN Dirty; + /* Loop through all the paging files */ + for (i = 0; i < MmNumberOfPagingFiles; i++) + { + /* Free page file name */ + ASSERT(MmPagingFile[i]->PageFileName.Buffer != NULL); + ExFreePoolWithTag(MmPagingFile[i]->PageFileName.Buffer, TAG_MM); + MmPagingFile[i]->PageFileName.Buffer = NULL; + + /* And close them */ + ZwClose(MmPagingFile[i]->FileHandle); + } + /* Loop through all the pages owned by the legacy Mm and page them out, if needed. */ - /* We do it twice, since flushing can cause the FS to dirtify new pages */ + /* We do it as long as there are dirty pages, since flushing can cause the FS to dirtify new ones. */ do { Dirty = FALSE; @@ -59,20 +71,6 @@ MiShutdownSystem(VOID) Page = MmGetLRUNextUserPage(Page, FALSE); } } while (Dirty); - - /* Loop through all the paging files */ - for (i = 0; i < MmNumberOfPagingFiles; i++) - { - /* Free page file name */ - ASSERT(MmPagingFile[i]->PageFileName.Buffer != NULL); - ExFreePoolWithTag(MmPagingFile[i]->PageFileName.Buffer, TAG_MM); - MmPagingFile[i]->PageFileName.Buffer = NULL; - - /* And close them */ - ZwClose(MmPagingFile[i]->FileHandle); - } - - UNIMPLEMENTED; } VOID

1 0

[reactos] 01/01: [SYSSETUP] Update German translation.
by Robert Naumann 09 Feb '21

09 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b493a2f8ab8fe065dd74e… commit b493a2f8ab8fe065dd74eb32dce52b37785ad0a4 Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Tue Feb 9 21:03:34 2021 +0100 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Tue Feb 9 21:03:34 2021 +0100 [SYSSETUP] Update German translation. --- dll/win32/syssetup/lang/de-DE.rc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index c4c124b6a08..083b1c3fa8e 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -28,11 +28,11 @@ STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 - LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 - LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + LTEXT "Bitte wählen Sie eines der folgenden Produkte:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Produktauswahl:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + GROUPBOX "Produktinformation", IDC_STATIC, 5, 50, 305, 85 + LTEXT "Beschreibung:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END @@ -243,11 +243,11 @@ END STRINGTABLE BEGIN - IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTTITLE "Produktauswahl" + IDS_PRODUCTSUBTITLE "Die Auswahl der folgenden Produkte wirkt sich auf das Verhalten des Systems aus." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" - IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." - IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." - IDS_DEFAULT "(Default)" + IDS_PRODUCTSERVERINFO "Das System wird als Server erkannt. Die persönlichen Ordner ""Eigene Bilder"", ""Eigene Videos"" und ""Eigene Musik"" sind unabhängig von ""Eigene Dokumente""." + IDS_PRODUCTWORKSTATIONINFO "Das System wird als Workstation erkannt. Die persönlichen Ordner ""Eigene Bilder"", ""Eigene Videos"" und ""Eigene Musik"" sind Unterordner von ""Eigene Dokumente""." + IDS_DEFAULT "(Standard)" END

1 0

[reactos] 01/01: [NTOS:CC] Raise status, when CcMapData fails (#3348)
by Timo Kreuzer 09 Feb '21

09 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca744679045e7f3615db5… commit ca744679045e7f3615db588a8223ace2058e3f10 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Feb 9 09:29:48 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Feb 9 09:29:48 2021 +0100 [NTOS:CC] Raise status, when CcMapData fails (#3348) Also add a check in fastfat, that asserts, when CcMapData returns FALSE. --- drivers/filesystems/fastfat/fat.c | 8 ++++++-- ntoskrnl/cc/pin.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/filesystems/fastfat/fat.c b/drivers/filesystems/fastfat/fat.c index 591e60b4fd9..b6e62c68fcc 100644 --- a/drivers/filesystems/fastfat/fat.c +++ b/drivers/filesystems/fastfat/fat.c @@ -36,7 +36,7 @@ FAT32GetNextCluster( PVOID BaseAddress; ULONG FATOffset; ULONG ChunkSize; - PVOID Context; + PVOID Context = NULL; LARGE_INTEGER Offset; ChunkSize = CACHEPAGESIZE(DeviceExt); @@ -44,7 +44,11 @@ FAT32GetNextCluster( Offset.QuadPart = ROUND_DOWN(FATOffset, ChunkSize); _SEH2_TRY { - CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, MAP_WAIT, &Context, &BaseAddress); + if (!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, MAP_WAIT, &Context, &BaseAddress)) + { + NT_ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index c48f1068042..3d80befb660 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -376,7 +376,6 @@ CcMapData ( CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", SharedCacheMap->FileObject, FileOffset, Length, Flags); ExRaiseStatus(Status); - return FALSE; } iBcb = CcpGetAppropriateBcb(SharedCacheMap, Vacb, FileOffset, Length, 0, FALSE); @@ -385,7 +384,8 @@ CcMapData ( CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE); CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", SharedCacheMap->FileObject, FileOffset, Length, Flags); - return FALSE; + *pBcb = NULL; // If you ever remove this for compat, make sure to review all callers for using an unititialized value + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); } } else

1 0

[reactos] 01/01: [LOAD][UNLOAD] Fix w*printf() format strings (#3319)
by Serge Gautherie 08 Feb '21

08 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b933529079ab126c674b… commit 2b933529079ab126c674b539f8e2559c8ca5c8be Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Feb 8 16:47:13 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 8 16:47:13 2021 +0100 [LOAD][UNLOAD] Fix w*printf() format strings (#3319) Also: - Set ServiceName.MaximumLength. - Fix MSVC warnings: '...\load\load.c(19): warning C4267: '=': conversion from 'size_t' to 'USHORT', possible loss of data '...\unload\unload.c(19): warning C4267: '=': conversion from 'size_t' to 'USHORT', possible loss of data' '...\unload\unload.c(24): warning C4476: 'wprintf' : unknown type field character 'U' in format specifier' '...\unload\unload.c(24): warning C4474: 'wprintf' : too many arguments passed for format string' --- .../rosapps/applications/sysutils/utils/driver/load/load.c | 14 +++++++++----- .../applications/sysutils/utils/driver/unload/unload.c | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/modules/rosapps/applications/sysutils/utils/driver/load/load.c b/modules/rosapps/applications/sysutils/utils/driver/load/load.c index 557815adf4a..fedbb41a314 100644 --- a/modules/rosapps/applications/sysutils/utils/driver/load/load.c +++ b/modules/rosapps/applications/sysutils/utils/driver/load/load.c @@ -16,18 +16,22 @@ int wmain(int argc, WCHAR * argv[]) wprintf(L"Usage: load <ServiceName>\n"); return 0; } - ServiceName.Length = (wcslen(argv[1]) + 52) * sizeof(WCHAR); - ServiceName.Buffer = (LPWSTR)malloc(ServiceName.Length + sizeof(UNICODE_NULL)); + + ServiceName.Length = (USHORT)((52 + wcslen(argv[1])) * sizeof(WCHAR)); + ServiceName.MaximumLength = ServiceName.Length + sizeof(UNICODE_NULL); + ServiceName.Buffer = malloc(ServiceName.MaximumLength); wsprintf(ServiceName.Buffer, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%S", + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%s", argv[1]); - wprintf(L"%s %u %Id\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer)); + wprintf(L"Loading %wZ\n", &ServiceName); + Status = NtLoadDriver(&ServiceName); free(ServiceName.Buffer); if (!NT_SUCCESS(Status)) { - wprintf(L"Failed: %x\n", Status); + wprintf(L"Failed: 0x%08lx\n", Status); return 1; } + return 0; } diff --git a/modules/rosapps/applications/sysutils/utils/driver/unload/unload.c b/modules/rosapps/applications/sysutils/utils/driver/unload/unload.c index 6bc68c1890d..ff09b6e04eb 100644 --- a/modules/rosapps/applications/sysutils/utils/driver/unload/unload.c +++ b/modules/rosapps/applications/sysutils/utils/driver/unload/unload.c @@ -16,18 +16,22 @@ int wmain(int argc, WCHAR * argv[]) wprintf(L"Usage: unload <ServiceName>\n"); return 0; } - ServiceName.Length = (wcslen(argv[1]) + 52) * sizeof(WCHAR); - ServiceName.Buffer = (LPWSTR)malloc(ServiceName.Length + sizeof(UNICODE_NULL)); + + ServiceName.Length = (USHORT)((52 + wcslen(argv[1])) * sizeof(WCHAR)); + ServiceName.MaximumLength = ServiceName.Length + sizeof(UNICODE_NULL); + ServiceName.Buffer = malloc(ServiceName.MaximumLength); wsprintf(ServiceName.Buffer, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%S", + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%s", argv[1]); - wprintf(L"%s %d %Ud\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer)); + wprintf(L"Unloading %wZ\n", &ServiceName); + Status = NtUnloadDriver(&ServiceName); free(ServiceName.Buffer); if (!NT_SUCCESS(Status)) { - wprintf(L"Failed: %X\n", Status); + wprintf(L"Failed: 0x%08lx\n", Status); return 1; } + return 0; }

1 0

[reactos] 01/01: [DOC][WS2_32][WS2HELP] Fix ws2* paths (#3425)
by Serge Gautherie 07 Feb '21

07 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=682f85ad9f0748485c1ab… commit 682f85ad9f0748485c1aba0e6780af6364a28ace Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Feb 7 22:17:01 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 7 22:17:01 2021 +0100 [DOC][WS2_32][WS2HELP] Fix ws2* paths (#3425) --- dll/win32/ws2_32/inc/ws2_32.h | 2 +- dll/win32/ws2_32/inc/ws2_32p.h | 2 +- dll/win32/ws2_32/src/addrconv.c | 2 +- dll/win32/ws2_32/src/addrinfo.c | 2 +- dll/win32/ws2_32/src/async.c | 2 +- dll/win32/ws2_32/src/bhook.c | 2 +- dll/win32/ws2_32/src/dcatalog.c | 2 +- dll/win32/ws2_32/src/dcatitem.c | 2 +- dll/win32/ws2_32/src/dllmain.c | 2 +- dll/win32/ws2_32/src/dprocess.c | 2 +- dll/win32/ws2_32/src/dprovide.c | 2 +- dll/win32/ws2_32/src/dsocket.c | 2 +- dll/win32/ws2_32/src/dthread.c | 2 +- dll/win32/ws2_32/src/dupsock.c | 2 +- dll/win32/ws2_32/src/enumprot.c | 2 +- dll/win32/ws2_32/src/event.c | 2 +- dll/win32/ws2_32/src/getproto.c | 2 +- dll/win32/ws2_32/src/getxbyxx.c | 2 +- dll/win32/ws2_32/src/ioctl.c | 2 +- dll/win32/ws2_32/src/nscatalo.c | 2 +- dll/win32/ws2_32/src/nscatent.c | 2 +- dll/win32/ws2_32/src/nspinstl.c | 2 +- dll/win32/ws2_32/src/nsprovid.c | 2 +- dll/win32/ws2_32/src/nsquery.c | 2 +- dll/win32/ws2_32/src/qos.c | 2 +- dll/win32/ws2_32/src/qshelpr.c | 2 +- dll/win32/ws2_32/src/rasdial.c | 2 +- dll/win32/ws2_32/src/recv.c | 2 +- dll/win32/ws2_32/src/rnr.c | 2 +- dll/win32/ws2_32/src/scihlpr.c | 2 +- dll/win32/ws2_32/src/select.c | 2 +- dll/win32/ws2_32/src/send.c | 2 +- dll/win32/ws2_32/src/sockctrl.c | 2 +- dll/win32/ws2_32/src/socklife.c | 2 +- dll/win32/ws2_32/src/spinstal.c | 2 +- dll/win32/ws2_32/src/sputil.c | 2 +- dll/win32/ws2_32/src/startup.c | 2 +- dll/win32/ws2_32/src/wsautil.c | 2 +- dll/win32/ws2help/apc.c | 2 +- dll/win32/ws2help/context.c | 2 +- dll/win32/ws2help/dllmain.c | 2 +- dll/win32/ws2help/handle.c | 2 +- dll/win32/ws2help/notify.c | 2 +- dll/win32/ws2help/precomp.h | 2 +- dll/win32/ws2help/wshdrv.h | 2 +- media/doc/WINESYNC.txt | 3 --- 46 files changed, 45 insertions(+), 48 deletions(-) diff --git a/dll/win32/ws2_32/inc/ws2_32.h b/dll/win32/ws2_32/inc/ws2_32.h index 349a9624790..b65d27a03ea 100644 --- a/dll/win32/ws2_32/inc/ws2_32.h +++ b/dll/win32/ws2_32/inc/ws2_32.h @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2.2 Library - * FILE: dll/win32/ws2_32_new/inc/ws2_32.h + * FILE: dll/win32/ws2_32/inc/ws2_32.h * PURPOSE: WinSock 2.2 Main Header */ diff --git a/dll/win32/ws2_32/inc/ws2_32p.h b/dll/win32/ws2_32/inc/ws2_32p.h index 968c6ce7b83..5f1c748b97e 100644 --- a/dll/win32/ws2_32/inc/ws2_32p.h +++ b/dll/win32/ws2_32/inc/ws2_32p.h @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2.2 Library - * FILE: dll/win32/ws2_32_new/inc/ws2_32p.h + * FILE: dll/win32/ws2_32/inc/ws2_32p.h * PURPOSE: WinSock 2.2 Main Header */ diff --git a/dll/win32/ws2_32/src/addrconv.c b/dll/win32/ws2_32/src/addrconv.c index b91bc1e720f..3cfca497a47 100644 --- a/dll/win32/ws2_32/src/addrconv.c +++ b/dll/win32/ws2_32/src/addrconv.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/addrconv.c + * FILE: dll/win32/ws2_32/src/addrconv.c * PURPOSE: Address and Port Conversion Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/addrinfo.c b/dll/win32/ws2_32/src/addrinfo.c index 285e9458a6d..e49d2ac64b0 100644 --- a/dll/win32/ws2_32/src/addrinfo.c +++ b/dll/win32/ws2_32/src/addrinfo.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/addrinfo.c + * FILE: dll/win32/ws2_32/src/addrinfo.c * PURPOSE: Protocol-Independent Address Resolution * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/async.c b/dll/win32/ws2_32/src/async.c index 52eb42e663d..207e83ec098 100644 --- a/dll/win32/ws2_32/src/async.c +++ b/dll/win32/ws2_32/src/async.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/async.c + * FILE: dll/win32/ws2_32/src/async.c * PURPOSE: Async Block Object and Async Thread Management * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/bhook.c b/dll/win32/ws2_32/src/bhook.c index 6ce056cc597..c59b54b0c0c 100644 --- a/dll/win32/ws2_32/src/bhook.c +++ b/dll/win32/ws2_32/src/bhook.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/bhook.c + * FILE: dll/win32/ws2_32/src/bhook.c * PURPOSE: Blocking Hook support for 1.x clients * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/dcatalog.c b/dll/win32/ws2_32/src/dcatalog.c index 3b7929f9d04..d91ec564349 100644 --- a/dll/win32/ws2_32/src/dcatalog.c +++ b/dll/win32/ws2_32/src/dcatalog.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/dcatalog.c + * FILE: dll/win32/ws2_32/src/dcatalog.c * PURPOSE: Transport Catalog Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/dcatitem.c b/dll/win32/ws2_32/src/dcatitem.c index 28ec0fa8f83..de0b7c1489b 100644 --- a/dll/win32/ws2_32/src/dcatitem.c +++ b/dll/win32/ws2_32/src/dcatitem.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/dcatitem.c + * FILE: dll/win32/ws2_32/src/dcatitem.c * PURPOSE: Transport Catalog Entry Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/dllmain.c b/dll/win32/ws2_32/src/dllmain.c index 4d7595a0337..67d7c432fe1 100644 --- a/dll/win32/ws2_32/src/dllmain.c +++ b/dll/win32/ws2_32/src/dllmain.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/dllmain.c + * FILE: dll/win32/ws2_32/src/dllmain.c * PURPOSE: DLL Entrypoint * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/dprocess.c b/dll/win32/ws2_32/src/dprocess.c index ad3ef575d3b..2ab9e150267 100644 --- a/dll/win32/ws2_32/src/dprocess.c +++ b/dll/win32/ws2_32/src/dprocess.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/dprocess.c + * FILE: dll/win32/ws2_32/src/dprocess.c * PURPOSE: Process Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/dprovide.c b/dll/win32/ws2_32/src/dprovide.c index bc0f2f057b8..f5d9b4c4391 100644 --- a/dll/win32/ws2_32/src/dprovide.c +++ b/dll/win32/ws2_32/src/dprovide.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/dprovide.c + * FILE: dll/win32/ws2_32/src/dprovide.c * PURPOSE: Transport Provider Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/dsocket.c b/dll/win32/ws2_32/src/dsocket.c index 382859faa63..ddc220ef25c 100644 --- a/dll/win32/ws2_32/src/dsocket.c +++ b/dll/win32/ws2_32/src/dsocket.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/dsocket.c + * FILE: dll/win32/ws2_32/src/dsocket.c * PURPOSE: Socket Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/dthread.c b/dll/win32/ws2_32/src/dthread.c index d919d909352..fdbd46353a1 100644 --- a/dll/win32/ws2_32/src/dthread.c +++ b/dll/win32/ws2_32/src/dthread.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/dthread.c + * FILE: dll/win32/ws2_32/src/dthread.c * PURPOSE: Thread Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/dupsock.c b/dll/win32/ws2_32/src/dupsock.c index 44e8a85cf92..6a55b65cef6 100644 --- a/dll/win32/ws2_32/src/dupsock.c +++ b/dll/win32/ws2_32/src/dupsock.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/dupsock.c + * FILE: dll/win32/ws2_32/src/dupsock.c * PURPOSE: Socket Duplication * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/enumprot.c b/dll/win32/ws2_32/src/enumprot.c index be1ff596cc6..b344a6cec62 100644 --- a/dll/win32/ws2_32/src/enumprot.c +++ b/dll/win32/ws2_32/src/enumprot.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/enumprot.c + * FILE: dll/win32/ws2_32/src/enumprot.c * PURPOSE: Protocol Enumeration * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) * Pierre Schweitzer diff --git a/dll/win32/ws2_32/src/event.c b/dll/win32/ws2_32/src/event.c index d359e054903..0cb43107965 100644 --- a/dll/win32/ws2_32/src/event.c +++ b/dll/win32/ws2_32/src/event.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/event.c + * FILE: dll/win32/ws2_32/src/event.c * PURPOSE: Socket Events * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/getproto.c b/dll/win32/ws2_32/src/getproto.c index 1f67cbdecc4..38daf580f82 100644 --- a/dll/win32/ws2_32/src/getproto.c +++ b/dll/win32/ws2_32/src/getproto.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/getproto.c + * FILE: dll/win32/ws2_32/src/getproto.c * PURPOSE: GetProtoByY Functions. * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/getxbyxx.c b/dll/win32/ws2_32/src/getxbyxx.c index 50177d7ade6..8f559346222 100644 --- a/dll/win32/ws2_32/src/getxbyxx.c +++ b/dll/win32/ws2_32/src/getxbyxx.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/getxbyxx.c + * FILE: dll/win32/ws2_32/src/getxbyxx.c * PURPOSE: Get X by Y Functions for Name Resolution. * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/ioctl.c b/dll/win32/ws2_32/src/ioctl.c index 486573994ab..95ab2122c9c 100644 --- a/dll/win32/ws2_32/src/ioctl.c +++ b/dll/win32/ws2_32/src/ioctl.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/ioctl.c + * FILE: dll/win32/ws2_32/src/ioctl.c * PURPOSE: Socket I/O Control Code support. * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/nscatalo.c b/dll/win32/ws2_32/src/nscatalo.c index 43a782a058a..6d32a4c8b7c 100644 --- a/dll/win32/ws2_32/src/nscatalo.c +++ b/dll/win32/ws2_32/src/nscatalo.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/nscatalo.c + * FILE: dll/win32/ws2_32/src/nscatalo.c * PURPOSE: Namespace Catalog Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/nscatent.c b/dll/win32/ws2_32/src/nscatent.c index b4835540479..53f00b5f607 100644 --- a/dll/win32/ws2_32/src/nscatent.c +++ b/dll/win32/ws2_32/src/nscatent.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/nscatent.c + * FILE: dll/win32/ws2_32/src/nscatent.c * PURPOSE: Namespace Catalog Entry Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/nspinstl.c b/dll/win32/ws2_32/src/nspinstl.c index 4278ea6f780..22849d3540f 100644 --- a/dll/win32/ws2_32/src/nspinstl.c +++ b/dll/win32/ws2_32/src/nspinstl.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/nspinstl.c + * FILE: dll/win32/ws2_32/src/nspinstl.c * PURPOSE: Namespace Provider Installation * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/nsprovid.c b/dll/win32/ws2_32/src/nsprovid.c index 8856f057d86..70d03c445f8 100644 --- a/dll/win32/ws2_32/src/nsprovid.c +++ b/dll/win32/ws2_32/src/nsprovid.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/nsprovid.c + * FILE: dll/win32/ws2_32/src/nsprovid.c * PURPOSE: Namespace Provider Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/nsquery.c b/dll/win32/ws2_32/src/nsquery.c index eb476aeffd5..16c58150c66 100644 --- a/dll/win32/ws2_32/src/nsquery.c +++ b/dll/win32/ws2_32/src/nsquery.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/nsquery.c + * FILE: dll/win32/ws2_32/src/nsquery.c * PURPOSE: Namespace Query Object * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/qos.c b/dll/win32/ws2_32/src/qos.c index e80fe1d3c93..a606cb7319f 100644 --- a/dll/win32/ws2_32/src/qos.c +++ b/dll/win32/ws2_32/src/qos.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/qos.c + * FILE: dll/win32/ws2_32/src/qos.c * PURPOSE: QoS Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/qshelpr.c b/dll/win32/ws2_32/src/qshelpr.c index 48b31121382..f95512304b4 100644 --- a/dll/win32/ws2_32/src/qshelpr.c +++ b/dll/win32/ws2_32/src/qshelpr.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/qshelpr.c + * FILE: dll/win32/ws2_32/src/qshelpr.c * PURPOSE: Query Set Conversion/Packing Helpers * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/rasdial.c b/dll/win32/ws2_32/src/rasdial.c index 46175896c86..691152e6639 100644 --- a/dll/win32/ws2_32/src/rasdial.c +++ b/dll/win32/ws2_32/src/rasdial.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/rasdial.c + * FILE: dll/win32/ws2_32/src/rasdial.c * PURPOSE: RAS Auto-Dial Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/recv.c b/dll/win32/ws2_32/src/recv.c index 83784bc8481..7ab31c05b01 100644 --- a/dll/win32/ws2_32/src/recv.c +++ b/dll/win32/ws2_32/src/recv.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/recv.c + * FILE: dll/win32/ws2_32/src/recv.c * PURPOSE: Socket Receive Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/rnr.c b/dll/win32/ws2_32/src/rnr.c index 43ebea276cd..b6e1fd691b2 100644 --- a/dll/win32/ws2_32/src/rnr.c +++ b/dll/win32/ws2_32/src/rnr.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/rnr.c + * FILE: dll/win32/ws2_32/src/rnr.c * PURPOSE: Registration and Resolution Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/scihlpr.c b/dll/win32/ws2_32/src/scihlpr.c index 4b8bb6ea772..5c8a0bd1c33 100644 --- a/dll/win32/ws2_32/src/scihlpr.c +++ b/dll/win32/ws2_32/src/scihlpr.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/scihlpr.c + * FILE: dll/win32/ws2_32/src/scihlpr.c * PURPOSE: Service Class Information Conversion/Packing Helpers * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/select.c b/dll/win32/ws2_32/src/select.c index 444e3c67f3c..5062b6441cf 100644 --- a/dll/win32/ws2_32/src/select.c +++ b/dll/win32/ws2_32/src/select.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/select.c + * FILE: dll/win32/ws2_32/src/select.c * PURPOSE: Socket Select Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/send.c b/dll/win32/ws2_32/src/send.c index bba4ab032c0..189cb5ef222 100644 --- a/dll/win32/ws2_32/src/send.c +++ b/dll/win32/ws2_32/src/send.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/send.c + * FILE: dll/win32/ws2_32/src/send.c * PURPOSE: Socket Sending Support. * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/sockctrl.c b/dll/win32/ws2_32/src/sockctrl.c index 458aafec077..15a13a55053 100644 --- a/dll/win32/ws2_32/src/sockctrl.c +++ b/dll/win32/ws2_32/src/sockctrl.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/sockctrl.c + * FILE: dll/win32/ws2_32/src/sockctrl.c * PURPOSE: Socket Control/State Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/socklife.c b/dll/win32/ws2_32/src/socklife.c index 5b14364f550..a04eb8f01d2 100644 --- a/dll/win32/ws2_32/src/socklife.c +++ b/dll/win32/ws2_32/src/socklife.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/socklife.c + * FILE: dll/win32/ws2_32/src/socklife.c * PURPOSE: Socket Lifetime Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/spinstal.c b/dll/win32/ws2_32/src/spinstal.c index 8b6ee895924..3e5d420d1a9 100644 --- a/dll/win32/ws2_32/src/spinstal.c +++ b/dll/win32/ws2_32/src/spinstal.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/spinstal.c + * FILE: dll/win32/ws2_32/src/spinstal.c * PURPOSE: Transport Service Provider Installation * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/sputil.c b/dll/win32/ws2_32/src/sputil.c index f43de290dd7..0e143bf0c14 100644 --- a/dll/win32/ws2_32/src/sputil.c +++ b/dll/win32/ws2_32/src/sputil.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/sputil.c + * FILE: dll/win32/ws2_32/src/sputil.c * PURPOSE: Transport Service Provider Utility Functions * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/startup.c b/dll/win32/ws2_32/src/startup.c index 86706c84793..005ca68353e 100644 --- a/dll/win32/ws2_32/src/startup.c +++ b/dll/win32/ws2_32/src/startup.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/startup.c + * FILE: dll/win32/ws2_32/src/startup.c * PURPOSE: Startup/Cleanup Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2_32/src/wsautil.c b/dll/win32/ws2_32/src/wsautil.c index d40ea2829b5..33563dc6e22 100644 --- a/dll/win32/ws2_32/src/wsautil.c +++ b/dll/win32/ws2_32/src/wsautil.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API - * FILE: dll/win32/ws2_32_new/src/wsautil.c + * FILE: dll/win32/ws2_32/src/wsautil.c * PURPOSE: Winsock Utility Functions * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ diff --git a/dll/win32/ws2help/apc.c b/dll/win32/ws2help/apc.c index 0e55a891a2b..3a7b675b1a3 100644 --- a/dll/win32/ws2help/apc.c +++ b/dll/win32/ws2help/apc.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: include/ws2_32.h + * FILE: dll/win32/ws2help/apc.c * PURPOSE: WinSock 2 DLL header */ diff --git a/dll/win32/ws2help/context.c b/dll/win32/ws2help/context.c index 05230d16465..40b6145e88c 100644 --- a/dll/win32/ws2help/context.c +++ b/dll/win32/ws2help/context.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: include/ws2_32.h + * FILE: dll/win32/ws2help/context.c * PURPOSE: WinSock 2 DLL header */ diff --git a/dll/win32/ws2help/dllmain.c b/dll/win32/ws2help/dllmain.c index dc18f1e0727..f563487626c 100644 --- a/dll/win32/ws2help/dllmain.c +++ b/dll/win32/ws2help/dllmain.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: include/ws2_32.h + * FILE: dll/win32/ws2help/dllmain.c * PURPOSE: WinSock 2 DLL header */ diff --git a/dll/win32/ws2help/handle.c b/dll/win32/ws2help/handle.c index 00ead65e21b..ef5d9750dde 100644 --- a/dll/win32/ws2help/handle.c +++ b/dll/win32/ws2help/handle.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: include/ws2_32.h + * FILE: dll/win32/ws2help/handle.c * PURPOSE: WinSock 2 DLL header */ diff --git a/dll/win32/ws2help/notify.c b/dll/win32/ws2help/notify.c index ddec693693d..01421c47b17 100644 --- a/dll/win32/ws2help/notify.c +++ b/dll/win32/ws2help/notify.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: include/ws2_32.h + * FILE: dll/win32/ws2help/notify.c * PURPOSE: WinSock 2 DLL header */ diff --git a/dll/win32/ws2help/precomp.h b/dll/win32/ws2help/precomp.h index 394a71a009e..37efa95b665 100644 --- a/dll/win32/ws2help/precomp.h +++ b/dll/win32/ws2help/precomp.h @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 Helper DLL - * FILE: lib/ws2help/precomp.h + * FILE: dll/win32/ws2help/precomp.h * PURPOSE: WinSock 2 Helper DLL */ diff --git a/dll/win32/ws2help/wshdrv.h b/dll/win32/ws2help/wshdrv.h index 44b67721204..0db8ee34506 100644 --- a/dll/win32/ws2help/wshdrv.h +++ b/dll/win32/ws2help/wshdrv.h @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: include/drivers/ws2ifsl/wshdrv.h + * FILE: dll/win32/ws2help/wshdrv.h * PURPOSE: WinSock 2 Helper Driver header */ diff --git a/media/doc/WINESYNC.txt b/media/doc/WINESYNC.txt index e73dccfd1f3..1b78cfd0cfd 100644 --- a/media/doc/WINESYNC.txt +++ b/media/doc/WINESYNC.txt @@ -362,6 +362,3 @@ win32k - winmm - modules/rostests/winetests/winmm # Synced to WineStaging-4.18 - -ws2_32 - - dll/win32/ws2_32/wine/async.c # Synced to WineStaging-1.9.4

1 0

[reactos] 01/01: [TRANSLATION] Chinese Traditional (zh-TW) translation improvement (#3430)
by Aobi Chan CL 07 Feb '21

07 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3692b5ff2525b7c7764d4… commit 3692b5ff2525b7c7764d44b2dd1ec0b13abad4a6 Author: Aobi Chan CL <eason066(a)gmail.com> AuthorDate: Mon Feb 8 05:14:19 2021 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 7 22:14:19 2021 +0100 [TRANSLATION] Chinese Traditional (zh-TW) translation improvement (#3430) - CACLS, FONTSUB, NOTEPAD, SOLITAIRE, VCDCONTROLTOOL, WORDPAD: Update Chinese Traditional translation. - CALC, PING, SYSTEMINFO Add Chinese Traditional translation. - PING, SYSTEMINFO: Update zh-TW.rc to make it less Windows like (maybe). - WRITE, WINFILE: Translation sync to Wine. + Update media/doc/For_Chinese_Translation.txt --- base/applications/cacls/lang/zh-TW.rc | 2 +- base/applications/calc/lang/zh-TW.rc | 711 +++++++++++++++++++++ base/applications/calc/resource.rc | 3 + base/applications/games/solitaire/lang/zh-TW.rc | 4 +- base/applications/network/ping/lang/zh-TW.rc | 83 ++- base/applications/notepad/lang/zh-TW.rc | 2 +- base/applications/wordpad/lang/zh-TW.rc | 81 +-- base/applications/write/lang/Zh.rc | 12 +- media/doc/For_Chinese_Translation.txt | 16 +- .../applications/sysutils/fontsub/lang/zh-TW.rc | 8 +- .../applications/sysutils/systeminfo/lang/zh-TW.rc | 70 ++ .../applications/sysutils/systeminfo/rsrc.rc | 3 + .../applications/vcdcontroltool/lang/zh-TW.rc | 2 +- modules/rosapps/applications/winfile/lang/zh-TW.rc | 148 ++++- 14 files changed, 1028 insertions(+), 117 deletions(-) diff --git a/base/applications/cacls/lang/zh-TW.rc b/base/applications/cacls/lang/zh-TW.rc index 4b13b4445a1..ae795460bcc 100644 --- a/base/applications/cacls/lang/zh-TW.rc +++ b/base/applications/cacls/lang/zh-TW.rc @@ -23,7 +23,7 @@ CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\ W 寫入\n\ C 更改(寫入)\n\ F 完全控制\n\ - /R user 撤銷指定使用者的訪問權限(僅在与 /E 一起使用時合法)。\n\ + /R user 撤銷指定使用者的訪問權限(僅在與 /E 一起使用時才有效)。\n\ /P user:perm 替換指定使用者的訪問權限。\n\ Perm 可以是: N 無\n\ R 讀取\n\ diff --git a/base/applications/calc/lang/zh-TW.rc b/base/applications/calc/lang/zh-TW.rc new file mode 100644 index 00000000000..384371dc76d --- /dev/null +++ b/base/applications/calc/lang/zh-TW.rc @@ -0,0 +1,711 @@ +/* Traditional Chinese translation by 2021 Aobi Chan CL <eason066(a)gmail.com> */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +/* Dialogs */ + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS 計算器" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 9, "新細明體", 0, 0, 0x1 +BEGIN + GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 + CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 + CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 + CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 + CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 + CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 + CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 + CTEXT "", IDC_TEXT_PARENT, 93, 38, 18, 16, SS_CENTERIMAGE, WS_EX_CLIENTEDGE + CTEXT "", IDC_TEXT_MEMORY, 126, 38, 18, 16, SS_CENTERIMAGE, WS_EX_CLIENTEDGE + PUSHBUTTON "Sta", IDC_BUTTON_STA, 5, 60, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave", IDC_BUTTON_AVE, 5, 80, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum", IDC_BUTTON_SUM, 5, 100, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s", IDC_BUTTON_S, 5, 120, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat", IDC_BUTTON_DAT, 5, 140, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E", IDC_BUTTON_FE, 38, 60, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms", IDC_BUTTON_DMS, 38, 80, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin", IDC_BUTTON_SIN, 38, 100, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos", IDC_BUTTON_COS, 38, 120, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan", IDC_BUTTON_TAN, 38, 140, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(", IDC_BUTTON_LEFTPAR, 64, 60, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp", IDC_BUTTON_EXP, 64, 80, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y", IDC_BUTTON_XeY, 64, 100, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2", IDC_BUTTON_Xe2, 64, 120, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3", IDC_BUTTON_Xe3, 64, 140, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")", IDC_BUTTON_RIGHTPAR, 90, 60, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln", IDC_BUTTON_LN, 90, 80, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log", IDC_BUTTON_LOG, 90, 100, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!", IDC_BUTTON_NF, 90, 120, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x", IDC_BUTTON_RX, 90, 140, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC", IDC_BUTTON_MC, 123, 60, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR", IDC_BUTTON_MR, 123, 80, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS", IDC_BUTTON_MS, 123, 100, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+", IDC_BUTTON_MP, 123, 120, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi", IDC_BUTTON_PI, 123, 140, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7", IDC_BUTTON_7, 156, 60, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4", IDC_BUTTON_4, 156, 80, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1", IDC_BUTTON_1, 156, 100, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0", IDC_BUTTON_0, 156, 120, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A", IDC_BUTTON_A, 156, 140, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8", IDC_BUTTON_8, 182, 60, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5", IDC_BUTTON_5, 182, 80, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2", IDC_BUTTON_2, 182, 100, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-", IDC_BUTTON_SIGN, 182, 120, 24, 18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B", IDC_BUTTON_B, 182, 140, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9", IDC_BUTTON_9, 208, 60, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6", IDC_BUTTON_6, 208, 80, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3", IDC_BUTTON_3, 208, 100, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",", IDC_BUTTON_DOT, 208, 120, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C", IDC_BUTTON_C, 208, 140, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/", IDC_BUTTON_DIV, 234, 60, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*", IDC_BUTTON_MULT, 234, 80, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-", IDC_BUTTON_SUB, 234, 100, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+", IDC_BUTTON_ADD, 234, 120, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D", IDC_BUTTON_D, 234, 140, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod", IDC_BUTTON_MOD, 260, 60, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Or", IDC_BUTTON_OR, 260, 80, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh", IDC_BUTTON_LSH, 260, 100, 24, 18, BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=", IDC_BUTTON_EQU, 260, 120, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E", IDC_BUTTON_E, 260, 140, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "And", IDC_BUTTON_AND, 286, 60, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor", IDC_BUTTON_XOR, 286, 80, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not", IDC_BUTTON_NOT, 286, 100, 24, 18, BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int", IDC_BUTTON_INT, 286, 120, 24, 18, BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 + CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | + NOT WS_VISIBLE, 150, 21, 38, 10 + CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | + NOT WS_VISIBLE, 190, 21, 38, 10 + CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | + NOT WS_VISIBLE, 230, 21, 38, 10 + CONTROL "位元組", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | + NOT WS_VISIBLE, 270, 21, 38, 10 + CONTROL "角度", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 + CONTROL "弧度", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 + CONTROL "梯度", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back", IDC_BUTTON_BACK, 177, 38, 43, 18, BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 305, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE + DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS 計算器" +MENU IDR_MENU_STANDARD +FONT 9, "新細明體", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C", IDC_BUTTON_CANC, 123, 23, 41, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE", IDC_BUTTON_CE, 80, 23, 41, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back", IDC_BUTTON_BACK, 36, 23, 42, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 159, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE + PUSHBUTTON "7", IDC_BUTTON_7, 36, 45, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4", IDC_BUTTON_4, 36, 65, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1", IDC_BUTTON_1, 36, 85, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0", IDC_BUTTON_0, 36, 105, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8", IDC_BUTTON_8, 62, 45, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5", IDC_BUTTON_5, 62, 65, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2", IDC_BUTTON_2, 62, 85, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-", IDC_BUTTON_SIGN, 62, 105, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9", IDC_BUTTON_9, 88, 45, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6", IDC_BUTTON_6, 88, 65, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3", IDC_BUTTON_3, 88, 85, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",", IDC_BUTTON_DOT, 88, 105, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/", IDC_BUTTON_DIV, 114, 45, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*", IDC_BUTTON_MULT, 114, 65, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-", IDC_BUTTON_SUB, 114, 85, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+", IDC_BUTTON_ADD, 114, 105, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sqrt", IDC_BUTTON_SQRT, 140, 45, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%", IDC_BUTTON_PERCENT, 140, 65, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x", IDC_BUTTON_RX, 140, 85, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=", IDC_BUTTON_EQU, 140, 105, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "", IDC_TEXT_MEMORY, 8, 24, 18, 16, SS_CENTERIMAGE, WS_EX_CLIENTEDGE + PUSHBUTTON "MC", IDC_BUTTON_MC, 5, 45, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR", IDC_BUTTON_MR, 5, 65, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS", IDC_BUTTON_MS, 5, 85, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+", IDC_BUTTON_MP, 5, 105, 24, 18, BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE +END + +IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS 計算器" +MENU IDR_MENU_STANDARD +FONT 9, "新細明體" +BEGIN + PUSHBUTTON "轉換", IDC_BUTTON_CONVERT, 35, 105, 76, 17 + COMBOBOX IDC_COMBO_CATEGORY, 5, 31, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | CBS_SORT + LTEXT "類別:", IDC_STATIC, 5, 20, 56, 8 + COMBOBOX IDC_COMBO_FROM, 5, 60, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | CBS_SORT + LTEXT "從...轉換:", IDC_STATIC, 5, 49, 56, 8 + COMBOBOX IDC_COMBO_TO, 5, 87, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | CBS_SORT + LTEXT "轉換為:", IDC_STATIC, 5, 76, 56, 8 + CONTROL "C", IDC_BUTTON_CANC, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 276, 24, 40, 17 + CONTROL "CE", IDC_BUTTON_CE, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 232, 24, 40, 17 + CONTROL "Back", IDC_BUTTON_BACK, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 24, 40,17 + RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 312, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE + CONTROL "7", IDC_BUTTON_7, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 48, 24, 18 + CONTROL "4", IDC_BUTTON_4, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 67, 24, 18 + CONTROL "1", IDC_BUTTON_1, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 86, 24, 18 + CONTROL "0", IDC_BUTTON_0, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 105, 24, 18 + CONTROL "8", IDC_BUTTON_8, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 214, 48, 24, 18 + CONTROL "5", IDC_BUTTON_5, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 214, 67, 24, 18 + CONTROL "2", IDC_BUTTON_2, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 214, 86, 24, 18 + CONTROL "+/-", IDC_BUTTON_SIGN, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 214, 105, 24, 18 + CONTROL "9", IDC_BUTTON_9, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 240, 48, 24, 18 + CONTROL "6", IDC_BUTTON_6, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 240, 67, 24, 18 + CONTROL "3", IDC_BUTTON_3, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 240, 86, 24, 18 + CONTROL ",", IDC_BUTTON_DOT, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 240, 105, 24, 18 + CONTROL "/", IDC_BUTTON_DIV, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 266, 48, 24, 18 + CONTROL "*", IDC_BUTTON_MULT, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 266, 67, 24, 18 + CONTROL "-", IDC_BUTTON_SUB, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 266, 86, 24, 18 + CONTROL "+", IDC_BUTTON_ADD, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 266, 105, 24, 18 + CONTROL "Sqrt", IDC_BUTTON_SQRT, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 292, 48, 24, 18 + CONTROL "%", IDC_BUTTON_PERCENT, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 292, 67, 24, 18 + CONTROL "1/x", IDC_BUTTON_RX, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 292, 86, 24, 18 + CONTROL "=", IDC_BUTTON_EQU, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 292, 105, 24, 18 + CTEXT "", IDC_TEXT_MEMORY, 152, 24, 24, 18, SS_CENTERIMAGE, WS_EX_CLIENTEDGE + CONTROL "MC", IDC_BUTTON_MC, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 48, 24, 18 + CONTROL "MR", IDC_BUTTON_MR, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 67, 24, 18 + CONTROL "MS", IDC_BUTTON_MS, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 86, 24, 18 + CONTROL "M+", IDC_BUTTON_MP, "Button", BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 105, 24, 18 + DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE +END + +IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "統計框" +FONT 9, "新細明體" +BEGIN + LISTBOX IDC_LIST_STAT, 4, 4, 156, 40, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "返回", IDC_BUTTON_RET, 4, 48, 36, 16 + PUSHBUTTON "載入", IDC_BUTTON_LOAD, 44, 48, 36, 16 + PUSHBUTTON "清除", IDC_BUTTON_CD, 84, 48, 36, 16 + PUSHBUTTON "全清", IDC_BUTTON_CAD, 124, 48, 36, 16 + CTEXT "n=0", IDC_TEXT_NITEMS, 4, 68, 156, 12, SS_CENTERIMAGE | SS_SUNKEN +END + +/* Menus */ + +IDR_MENU_SCIENTIFIC_1 MENU +BEGIN + POPUP "編輯" + BEGIN + MENUITEM "複製\tCtrl+C", IDM_EDIT_COPY + MENUITEM "貼上\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "查看" + BEGIN + MENUITEM "標準型", IDM_VIEW_STANDARD + MENUITEM "工程型", IDM_VIEW_SCIENTIFIC + MENUITEM "轉換", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "十六進制\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "十進制\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "八進制\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "二進制\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "角度\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "弧度\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "梯度\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "數字分組", IDM_VIEW_GROUP, CHECKED + END + POPUP "說明" + BEGIN + MENUITEM "說明主題", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "關於 ReactOS 計算器", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU +BEGIN + POPUP "編輯" + BEGIN + MENUITEM "複製\tCtrl+C", IDM_EDIT_COPY + MENUITEM "貼上\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "查看" + BEGIN + MENUITEM "標準型", IDM_VIEW_STANDARD + MENUITEM "工程型", IDM_VIEW_SCIENTIFIC + MENUITEM "轉換", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "十六進制\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "十進制\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "八進制\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "二進制\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "位元組\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "數字分組", IDM_VIEW_GROUP, CHECKED + END + POPUP "說明" + BEGIN + MENUITEM "說明主題", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "關於 ReactOS 計算器", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU +BEGIN + POPUP "編輯" + BEGIN + MENUITEM "複製\tCtrl+C", IDM_EDIT_COPY + MENUITEM "貼上\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "查看" + BEGIN + MENUITEM "標準型", IDM_VIEW_STANDARD + MENUITEM "工程型", IDM_VIEW_SCIENTIFIC + MENUITEM "轉換", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "數字分組", IDM_VIEW_GROUP, CHECKED + END + POPUP "說明" + BEGIN + MENUITEM "說明主題", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "關於 ReactOS 計算器", IDM_HELP_ABOUT + END +END + +/* String Tables */ + +STRINGTABLE +BEGIN + IDS_MATH_ERROR "錯誤" + IDS_QUICKHELP "快速說明" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ReactOS 計算器" + IDS_AUTHOR "作者 Carlo Bramini" +END + +/* Types of conversion */ +STRINGTABLE +BEGIN + IDS_CONV_ANGLE "角" + IDS_CONV_AREA "面積" + IDS_CONV_CONSUMPTION "油耗 (引擎)" + IDS_CONV_CURRENCY "貨幣" + IDS_CONV_ENERGY "能量" + IDS_CONV_LENGTH "長度" + IDS_CONV_POWER "功率" + IDS_CONV_PRESSURE "壓力" + IDS_CONV_TEMPERATURE "溫度" + IDS_CONV_TIME "時間" + IDS_CONV_VELOCITY "速度" + IDS_CONV_VOLUME "體積" + IDS_CONV_WEIGHT "質量" +END + +/* Angles */ +STRINGTABLE +BEGIN + IDS_ANGLE_ARCMINUTES "角分" + IDS_ANGLE_ARCSECONDS "角秒" + IDS_ANGLE_DEGREES "角度" + IDS_ANGLE_GRADIANS "梯度" + IDS_ANGLE_RADIANS "弧度" +END + +/* Areas */ +STRINGTABLE +BEGIN + IDS_AREA_ACRES "英畝" + IDS_AREA_ACRES_BRAZIL "英畝 (巴西)" + IDS_AREA_ACRES_FRANCE "英畝 (法國)" + IDS_AREA_ACRES_SCOTS "英畝 (蘇格蘭)" + IDS_AREA_ACRES_US "英畝 (美國)" + IDS_AREA_ARES "公畝" + IDS_AREA_CHOU "疇" + IDS_AREA_DANBO "大畝" + IDS_AREA_HECTARES "公頃" + IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_MORGEN_HUNGARY "摩根 (匈牙利)" + IDS_AREA_MU "畝" + IDS_AREA_PING "坪" + IDS_AREA_PYEONG "坪 (韓國)" + IDS_AREA_PYEONGBANGJA "Pyeongbangja" + IDS_AREA_RAI "萊" + IDS_AREA_SE "畝 (日本)" + IDS_AREA_SQUARE_CENTIMETERS "平方釐米" + IDS_AREA_SQUARE_CHR "Square chr" + IDS_AREA_SQUARE_FATHOMS "平方英尋" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "平方英尋 (匈牙利)" + IDS_AREA_SQUARE_FEET "平方英尺" + IDS_AREA_SQUARE_INCHES "平方英寸" + IDS_AREA_SQUARE_KILOMETERS "平方公里" + IDS_AREA_SQUARE_LAR "平方拉爾" + IDS_AREA_SQUARE_METER "平方米" + IDS_AREA_SQUARE_MILES "平方英里" + IDS_AREA_SQUARE_MILLIMETERS "平方毫米" + IDS_AREA_SQUARE_SHAKU "平方尺" + IDS_AREA_SQUARE_TSUEN "平方寸" + IDS_AREA_SQUARE_VA "Square va" + IDS_AREA_SQUARE_YARD "平方碼" + IDS_AREA_TAN "段" + IDS_AREA_TSUBO "坪 (日本)" +END + +/* Consumptions */ +STRINGTABLE +BEGIN + IDS_CONSUMPTION_KM_PER_L "公里/升" + IDS_CONSUMPTION_L_PER_100_KM "升/100 公里" + IDS_CONSUMPTION_MILES_GALLON_UK "英里/加侖 (英國)" + IDS_CONSUMPTION_MILES_GALLON_US "英里/加侖 (美國)" +END + +/* Currencies */ +STRINGTABLE +BEGIN + IDS_CURRENCY_AUSTRIAN_SCHILLING "奥地利先令" + IDS_CURRENCY_BELGIAN_FRANC "比利時法郎" + IDS_CURRENCY_CYPRIOT_POUND "賽普勒斯鎊" + IDS_CURRENCY_CZECH_KORUNA "捷克克朗" + IDS_CURRENCY_DEUTSCHE_MARK "德國馬克" + IDS_CURRENCY_DUTCH_GUILDER "荷蘭盾" + IDS_CURRENCY_ESTONIAN_KROON "愛沙尼亞克朗" + IDS_CURRENCY_EURO "歐元" + IDS_CURRENCY_FINNISH_MARKKA "芬蘭馬克" + IDS_CURRENCY_FRENCH_FRANC "法郎" + IDS_CURRENCY_GREEK_DRACHMA "希臘德拉克馬" + IDS_CURRENCY_IRISH_POUND "愛爾蘭鎊" + IDS_CURRENCY_ITALIAN_LIRA "義大利里拉" + IDS_CURRENCY_LATVIAN_LATS "拉脫維亞拉特" + IDS_CURRENCY_LITHUANIAN_LITAS "拉脫維亞拉分" + IDS_CURRENCY_LUXEMBOURG_FRANC "盧森堡法郎" + IDS_CURRENCY_MALTESE_LIRA "馬爾他里拉" + IDS_CURRENCY_PORTOGUESE_ESCUDO "葡萄牙埃斯庫多" + IDS_CURRENCY_SLOVAK_KORUNA "斯洛伐克克朗" + IDS_CURRENCY_SLOVENIAN_TOLAR "斯洛維尼亞拖拉" + IDS_CURRENCY_SPANISH_PESETA "西班牙比塞塔" +END + +/* Energies */ +STRINGTABLE +BEGIN + IDS_ENERGY_15_C_CALORIES "15 °C 卡路里" + IDS_ENERGY_BTUS "英制熱量單位" + IDS_ENERGY_ERGS "爾格" + IDS_ENERGY_EVS "電子伏特" + IDS_ENERGY_FOOT_POUNDS "英尺-磅" + IDS_ENERGY_IT_CALORIES "國際蒸汽表卡路里" + IDS_ENERGY_IT_KILOCALORIES "國際蒸汽表千卡路里" + IDS_ENERGY_JOULES "焦耳" + IDS_ENERGY_KILOJOULES "千焦耳" + IDS_ENERGY_KILOWATT_HOURS "千瓦時" + IDS_ENERGY_NUTRITION_CALORIES "營養卡路里" + IDS_ENERGY_TH_CALORIES "熱化學卡路里" +END + +/* Lengths */ +STRINGTABLE +BEGIN + IDS_LENGTH_ANGSTROMS "埃" + IDS_LENGTH_ASTRONOMICAL_UNITS "天文單位" + IDS_LENGTH_BARLEYCORNS "Barleycorns" + IDS_LENGTH_CENTIMETERS "釐米" + IDS_LENGTH_CHAINS_UK "鏈 (英國)" + IDS_LENGTH_CHI "尺" + IDS_LENGTH_CHOU "疇" + IDS_LENGTH_CHR "Chr" + IDS_LENGTH_CUN "寸" + IDS_LENGTH_FATHOMS "英尋" + IDS_LENGTH_FATHOMS_HUNGARY "英尋 (匈牙利)" + IDS_LENGTH_FEET "英尺" + IDS_LENGTH_FURLONGS "化朗" + IDS_LENGTH_GAN "杆" + IDS_LENGTH_HANDS "掌寬" + IDS_LENGTH_HUNH "Hunh" + IDS_LENGTH_INCHES "英尺" + IDS_LENGTH_JA "尺 (韓國)" + IDS_LENGTH_JEONG "Jeong" + IDS_LENGTH_KABIET "Kabiet" + IDS_LENGTH_KEN "Ken" + IDS_LENGTH_KEUB "Keub" + IDS_LENGTH_KILOMETERS "公里" + IDS_LENGTH_LAR "拉爾" + IDS_LENGTH_LIGHT_YEARS "光年" + IDS_LENGTH_LINKS_UK "Links (英國)" + IDS_LENGTH_METERS "米" + IDS_LENGTH_MICRONS "微米" + IDS_LENGTH_MILES "英里" + IDS_LENGTH_MILLIMETERS "毫米" + IDS_LENGTH_NAUTICAL_MILES "海里" + IDS_LENGTH_NIEU "Nieu" + IDS_LENGTH_PARSECS "秒差距" + IDS_LENGTH_PICAS "派卡" + IDS_LENGTH_RI_JAPAN "里 (日本)" + IDS_LENGTH_RI_KOREA "里 (韓國)" + IDS_LENGTH_RODS "杆" + IDS_LENGTH_SAWK "Sawk" + IDS_LENGTH_SEN "Sen" + IDS_LENGTH_SHAKU "尺 (日本)" + IDS_LENGTH_SPAN "拃" + IDS_LENGTH_SUN "寸 (日本)" + IDS_LENGTH_TSUEN "寸" + IDS_LENGTH_VA "Va" + IDS_LENGTH_YARDS "碼" + IDS_LENGTH_YOTE "約特" + IDS_LENGTH_ZHANG "丈" +END + +/* Powers */ +STRINGTABLE +BEGIN + IDS_POWER_BTUS_PER_MINUTE "英制熱量單位每分鐘" + IDS_POWER_FPS_PER_MINUTE "英尺-磅每分鐘" + IDS_POWER_HORSEPOWER "馬力" + IDS_POWER_KILOWATTS "千瓦" + IDS_POWER_MEGAWATTS "兆瓦" + IDS_POWER_WATTS "瓦" +END + +/* Pressures */ +STRINGTABLE +BEGIN + IDS_PRESSURE_ATMOSPHERES "大氣壓" + IDS_PRESSURE_BARS "巴" + IDS_PRESSURE_HECTOPASCALS "百帕" + IDS_PRESSURE_KILOPASCALS "千帕" + IDS_PRESSURE_MM_OF_MERCURY "毫米汞柱" + IDS_PRESSURE_PASCALS "帕斯卡" + IDS_PRESSURE_PSI "英磅-力每平方英尺" +END + +/* Temperatures */ +STRINGTABLE +BEGIN + IDS_TEMPERATURE_CELSIUS "攝氏度" + IDS_TEMPERATURE_FAHRENHEIT "華氏度" + IDS_TEMPERATURE_KELVIN "開爾文" + IDS_TEMPERATURE_RANKINE "蘭金度" +END + +/* Time */ +STRINGTABLE +BEGIN + IDS_TIME_DAYS "日" + IDS_TIME_HOURS "小時" + IDS_TIME_NANOSECONDS "納秒" + IDS_TIME_MICROSECONDS "微秒" + IDS_TIME_MILLISECONDS "毫秒" + IDS_TIME_MINUTES "分" + IDS_TIME_SECONDS "秒" + IDS_TIME_WEEKS "周" + IDS_TIME_YEARS "年" +END + +/* Velocities */ +STRINGTABLE +BEGIN + IDS_VELOCITY_CMS_SECOND "釐米/小時" + IDS_VELOCITY_FEET_HOUR "英尺/小時" + IDS_VELOCITY_FEET_SECOND "英尺/秒" + IDS_VELOCITY_KILOMETERS_HOUR "公里/小時" + IDS_VELOCITY_KNOTS "節" + IDS_VELOCITY_MACH "馬赫" + IDS_VELOCITY_METERS_SECOND "米/秒" + IDS_VELOCITY_MILES_HOUR "英里/小時" +END + +/* Volumes */ +STRINGTABLE +BEGIN + IDS_VOLUME_BARRELS_UK "桶 (英國)" + IDS_VOLUME_BARRELS_OIL "桶油" + IDS_VOLUME_BUN "Bun" + IDS_VOLUME_BUSHELS_UK "蒲式耳 (英國)" + IDS_VOLUME_BUSHELS_US "蒲式耳 (美國)" + IDS_VOLUME_CUBIC_CENTIMETERS "立方釐米" + IDS_VOLUME_CUBIC_FEET "立方英尺" + IDS_VOLUME_CUBIC_INCHES "立方英寸" + IDS_VOLUME_CUBIC_METERS "立方米" + IDS_VOLUME_CUBIC_YARDS "立方碼" + IDS_VOLUME_DOE "Doe" + IDS_VOLUME_FLUID_OUNCES_UK "液盎司 (英國)" + IDS_VOLUME_FLUID_OUNCES_US "液盎司 (美國)" + IDS_VOLUME_GALLONS_UK "加侖 (英國)" + IDS_VOLUME_GALLONS_DRY_US "乾量加侖 (美國)" + IDS_VOLUME_GALLONS_LIQUID_US "濕量加侖 (美國)" + IDS_VOLUME_GOU "合" + IDS_VOLUME_HOP "Hop" + IDS_VOLUME_ICCE "Icce" + IDS_VOLUME_KWIAN "Kwian" + IDS_VOLUME_LITERS "升" + IDS_VOLUME_MAL "Mal" + IDS_VOLUME_MILLILITERS "毫升" + IDS_VOLUME_PINTS_UK "品脱 (英國)" + IDS_VOLUME_PINTS_DRY_US "乾量品脱 (美國)" + IDS_VOLUME_PINTS_LIQUID_US "濕量品脱 (美國)" + IDS_VOLUME_QUARTS_UK "夸脫 (英國)" + IDS_VOLUME_QUARTS_DRY_US "乾量夸脫 (美國)" + IDS_VOLUME_QUARTS_LIQUID_US "濕量夸脫 (美國)" + IDS_VOLUME_SEKI "Seki" + IDS_VOLUME_SYOU "Syou" + IDS_VOLUME_TANANLOUNG "Tananloung" + IDS_VOLUME_TANG "Tang" + IDS_VOLUME_TO "斗 (日本)" +END + +/* Weights */ +STRINGTABLE +BEGIN + IDS_WEIGHT_BAHT "銖" + IDS_WEIGHT_CARATS "克拉" + IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_DON "Don" + IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GRAMS "克" + IDS_WEIGHT_GWAN "Gwan" + IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_JIN_CHINA "斤 (中國)" + IDS_WEIGHT_JIN_TAIWAN "斤 (臺灣)" + IDS_WEIGHT_KAN "貫 (日本)" + IDS_WEIGHT_KILOGRAMS "千克" + IDS_WEIGHT_KIN "斤 (日本)" + IDS_WEIGHT_LIANG_CHINA "兩 (中國)" + IDS_WEIGHT_LIANG_TAIWAN "兩 (臺灣)" + IDS_WEIGHT_MONME "兩 (日本)" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "常衡盎司" + IDS_WEIGHT_OUNCES_TROY "金衡盎司" + IDS_WEIGHT_POUNDS "英磅" + IDS_WEIGHT_QUINTAL_METRIC "公擔" + IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_STONES "石" + IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TONNES "噸" + IDS_WEIGHT_TONS_UK "噸 (英國)" + IDS_WEIGHT_TONS_US "噸 (美國)" +END diff --git a/base/applications/calc/resource.rc b/base/applications/calc/resource.rc index 3d0ba86e82b..3dd22e2ae6e 100644 --- a/base/applications/calc/resource.rc +++ b/base/applications/calc/resource.rc @@ -111,3 +111,6 @@ IDI_CALC ICON DISCARDABLE "res/calc.ico" #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif diff --git a/base/applications/games/solitaire/lang/zh-TW.rc b/base/applications/games/solitaire/lang/zh-TW.rc index bf9bd7ae374..ff8c2410ed8 100644 --- a/base/applications/games/solitaire/lang/zh-TW.rc +++ b/base/applications/games/solitaire/lang/zh-TW.rc @@ -59,8 +59,8 @@ BEGIN IDS_SOL_QUIT "退出目前遊戲？" IDS_SOL_WIN "恭喜你，你嬴了！！" IDS_SOL_DEAL "再玩一次？" - IDS_SOL_SCORE "Score: %d" - IDS_SOL_TIME "Time: %d" + IDS_SOL_SCORE "分數: %d" + IDS_SOL_TIME "時間: %d" END /* Menus */ diff --git a/base/applications/network/ping/lang/zh-TW.rc b/base/applications/network/ping/lang/zh-TW.rc index a03c20e6d4e..d15fdb2d4cd 100644 --- a/base/applications/network/ping/lang/zh-TW.rc +++ b/base/applications/network/ping/lang/zh-TW.rc @@ -1,7 +1,7 @@ /* * FILE: base/applications/network/ping/lang/zh-TW.rc * PURPOSE: Chinese (Traditional) translations for ReactOS Ping Command - * TRANSLATORS: + * TRANSLATORS: 2021 Aobi Chan CL (eason066(a)gmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -9,58 +9,57 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN IDS_USAGE "\n\ -Usage: ping [-t] [-a] [-n count] [-l size] [-f] [-i TTL] [-v TOS]\n\ +用法: ping [-t] [-a] [-n count] [-l size] [-f] [-i TTL] [-v TOS]\n\ [-w timeout] [-4] [-6] target\n\ \n\ -Options:\n\ - -t Ping the specified host until stopped.\n\ - To see statistics and continue - type Control-Break;\n\ - To stop - type Control-C.\n\ - -a Resolve addresses to hostnames.\n\ - -n count Number of echo requests to send.\n\ - -l size Send buffer size.\n\ - -f Set Don't Fragment flag in packet (IPv4-only).\n\ - -i TTL Time To Live.\n\ - -v TOS Type Of Service (IPv4-only. This setting has been deprecated\n\ - and has no effect on the type of service field in the IP\n\ - Header).\n\ - -w timeout Timeout in milliseconds to wait for each reply.\n\ - -4 Force using IPv4.\n\ - -6 Force using IPv6.\n\ +選項:\n\ + -t Ping 指定的主機直至停止。\n\ + 要查看統計資料並繼續，請按 Control-Break;\n\ + 如要停止，請按 Control-C。\n\ + -a 將位址解析為主機名稱。\n\ + -n count 要傳送的回應要求數。\n\ + -l size 傳送緩衝區的大小。\n\ + -f 在封包中設定 “Don't Fragment” 旗標 (僅限 IPv4)。\n\ + -i TTL 生存時間。\n\ + -v TOS 服務類型 (僅限 IPv4。此設定已棄用，\n\ + 且不會影響 IP 標頭中的服務類型欄位)。\n\ + -w timeout 等待每個回覆的逾時 (毫秒)。\n\ + -4 強制使用 IPv4。\n\ + -6 強制使用 IPv6。\n\ \n" IDS_CTRL_BREAK "Control-Break\n" IDS_CTRL_C "Control-C\n" - IDS_NO_RESOURCES "Not enough resources available.\n" - IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %s.\n" - IDS_BAD_OPTION "Bad option %s.\n" - IDS_BAD_PARAMETER "Bad parameter %s.\n" - IDS_BAD_VALUE "Bad value for option %s, valid range is from %u to %u.\n" - IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" - IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_NO_RESOURCES "可用資源不足。\n" + IDS_MISSING_ADDRESS "必須指定 IP 位址。\n" + IDS_MISSING_VALUE "必須為選項 %s 提供值。\n" + IDS_BAD_OPTION "錯誤的選項 %s。\n" + IDS_BAD_PARAMETER "錯誤的參數 %s。\n" + IDS_BAD_VALUE "選項中的值 %s 錯誤，有效範圍從 %u 到 %u。\n" + IDS_WRONG_FAMILY "選項 %s 只支持 %s。\n" + IDS_UNKNOWN_HOST "Ping 無法找到主機 %s。請檢查名稱，然後再試一次。\n" IDS_PINGING_ADDRESS "\nPinging %s " IDS_PINGING_HOSTNAME "\nPinging %s [%s] " - IDS_SOURCE_ADDRESS "from %s %s" - IDS_PING_SIZE "with %lu bytes of data:\n\n" - IDS_REPLY_FROM "Reply from %s: " - IDS_REPLY_BYTES "bytes=%d " - IDS_REPLY_TIME_MS "time=%lums " - IDS_REPLY_TIME_0MS "time<1ms " + IDS_SOURCE_ADDRESS "從 %s %s" + IDS_PING_SIZE "(以 %lu 位元組的資料傳送):\n\n" + IDS_REPLY_FROM "回覆自 %s: " + IDS_REPLY_BYTES "位元組=%d " + IDS_REPLY_TIME_MS "時間=%lums " + IDS_REPLY_TIME_0MS "時間<1ms " IDS_REPLY_TTL "TTL=%d\n" - IDS_REPLY_STATUS "Echo reply returned %lu.\n" - IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n" - IDS_REQUEST_TIMED_OUT "Request timed out.\n" - IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" + IDS_REPLY_STATUS "回應已返回 %lu。\n" + IDS_DEST_HOST_UNREACHABLE "無法連接到目標主機。\n" + IDS_DEST_NET_UNREACHABLE "無法連接到目標網路。\n" + IDS_REQUEST_TIMED_OUT "要求已逾時。\n" + IDS_TTL_EXPIRED "TTL 在傳輸途中過期。\n" + IDS_TRANSMIT_FAILED "PING: 傳輸失敗。(Error %u)\n" IDS_STATISTICS "\n\ -Ping statistics for %s:\n\ - Packets: Sent = %d, Received = %d, Lost %d (%d%% loss),\n" +%s 的 Ping 統計資料:\n\ + 封包: 已傳送 = %d, 已接收 = %d, 已遺失 %d (%d%% 遺失)，\n" - IDS_APPROXIMATE_RTT "Approximate round-trip time in milliseconds:\n\ - Minimum = %lums, Maximum = %lums, Average = %lums\n" + IDS_APPROXIMATE_RTT "大約的傳輸時間 (毫秒):\n\ + 最小值 = %lums, 最大值 = %lums, 平均 = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" + IDS_WINSOCK_FAIL "無法初始化 WinSock: %i\n" END diff --git a/base/applications/notepad/lang/zh-TW.rc b/base/applications/notepad/lang/zh-TW.rc index e85f9b8d468..5a4c45d581b 100644 --- a/base/applications/notepad/lang/zh-TW.rc +++ b/base/applications/notepad/lang/zh-TW.rc @@ -165,6 +165,6 @@ BEGIN STRING_PRINTERROR """%s"" 檔案列印失敗。\n\ 請檢查印表機是否已經開機和正確設定。" - STRING_TEXT_DOCUMENT "Text Document" + STRING_TEXT_DOCUMENT "純文字檔案" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/wordpad/lang/zh-TW.rc b/base/applications/wordpad/lang/zh-TW.rc index 459259c9633..df73d14707d 100644 --- a/base/applications/wordpad/lang/zh-TW.rc +++ b/base/applications/wordpad/lang/zh-TW.rc @@ -1,8 +1,9 @@ /* - * wordpad (Simplified and Traditional Chinese Resource) + * wordpad (Traditional Chinese Resource) * * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> + * Sync to Wine by 2020 Aobi Chan CL <eason066.at.gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,7 +29,7 @@ IDM_MAINMENU MENU BEGIN POPUP "檔案(&F)" BEGIN - MENUITEM "新建(&N)...\tCtrl+N", ID_FILE_NEW + MENUITEM "新增(&N)...\tCtrl+N", ID_FILE_NEW MENUITEM "開啟(&O)...\tCtrl+O", ID_FILE_OPEN MENUITEM "儲存(&S)\tCtrl+S", ID_FILE_SAVE MENUITEM "另存為(&A)...", ID_FILE_SAVEAS @@ -50,7 +51,7 @@ BEGIN MENUITEM "刪除(&D)\tDEL", ID_EDIT_CLEAR MENUITEM "全選(&S)\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "查找(&F)...\tCtrl+F", ID_FIND + MENUITEM "搜尋(&F)...\tCtrl+F", ID_FIND MENUITEM "找下一個(&N)\tF3", ID_FIND_NEXT MENUITEM "替換(&R)...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -61,23 +62,23 @@ BEGIN BEGIN MENUITEM "選擇資訊(&I)", ID_EDIT_SELECTIONINFO MENUITEM "文字格式(&F)", ID_EDIT_CHARFORMAT - MENUITEM "默認格式(&D)", ID_EDIT_DEFCHARFORMAT + MENUITEM "預設格式(&D)", ID_EDIT_DEFCHARFORMAT MENUITEM "段落格式(&H)", ID_EDIT_PARAFORMAT MENUITEM "獲取文字(&G)", ID_EDIT_GETTEXT END END POPUP "檢視(&V)" BEGIN - MENUITEM "工具欄(&T)", ID_TOGGLE_TOOLBAR - MENUITEM "格式工具欄(&F)", ID_TOGGLE_FORMATBAR + MENUITEM "工具列(&T)", ID_TOGGLE_TOOLBAR + MENUITEM "格式工具列(&F)", ID_TOGGLE_FORMATBAR MENUITEM "標尺(&R)", ID_TOGGLE_RULER - MENUITEM "狀態欄(&S)", ID_TOGGLE_STATUSBAR + MENUITEM "狀態列(&S)", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "選項(&O)...", ID_VIEWPROPERTIES END POPUP "插入(&I)" BEGIN - MENUITEM "日期時間(&D)...", ID_DATETIME + MENUITEM "日期和時間(&D)...", ID_DATETIME END POPUP "格式(&O)" BEGIN @@ -93,7 +94,7 @@ BEGIN END POPUP "說明(&H)" BEGIN - MENUITEM "關於 &Wine 寫字板", ID_ABOUT + MENUITEM "關於 Wine Wordpad(&W)", ID_ABOUT END END @@ -137,13 +138,13 @@ END STRINGTABLE BEGIN STRING_ALL_FILES, "所有檔案 (*.*)" - STRING_TEXT_FILES_TXT, "文本檔案 (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "統一碼文本檔案 (*.txt)" - STRING_RICHTEXT_FILES_RTF, "RTF豐富格式 (*.rtf)" - STRING_NEWFILE_RICHTEXT, "RTF豐富格式檔案" - STRING_NEWFILE_TXT, "文本檔案 " - STRING_NEWFILE_TXT_UNICODE, "統一碼文本檔案" - STRING_PRINTER_FILES_PRN, "列印檔案 (*.prn)" + STRING_TEXT_FILES_TXT, "純文字文件 (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "萬國碼文字文件 (*.txt)" + STRING_RICHTEXT_FILES_RTF, "豐富文字格式 (*.rtf)" + STRING_NEWFILE_RICHTEXT, "豐富文字格式檔案" + STRING_NEWFILE_TXT, "純文字文件 " + STRING_NEWFILE_TXT_UNICODE, "萬國碼文字文件" + STRING_PRINTER_FILES_PRN, "印表機檔案 (*.prn)" END STRINGTABLE @@ -156,7 +157,7 @@ END STRINGTABLE BEGIN STRING_VIEWPROPS_TITLE, "選項" - STRING_VIEWPROPS_TEXT, "文本文字" + STRING_VIEWPROPS_TEXT, "純文字" STRING_VIEWPROPS_RICHTEXT, "豐富格式文字" END @@ -172,27 +173,27 @@ BEGIN STRING_PREVIEW_CLOSE, "關閉" STRING_PREVIEW_PAGE, "頁" STRING_PREVIEW_PAGES, "頁" - STRING_UNITS_CM, "cm" - STRING_UNITS_IN, "in" - STRING_UNITS_INCH, "inch" - STRING_UNITS_PT, "pt" + STRING_UNITS_CM, "釐米" + STRING_UNITS_IN, "英吋" + STRING_UNITS_INCH, "英吋" + STRING_UNITS_PT, "英吋" END STRINGTABLE BEGIN - STRING_DEFAULT_FILENAME, "文檔" - STRING_PROMPT_SAVE_CHANGES, "儲存改動到 '%s'?" - STRING_SEARCH_FINISHED, "檔案查找結束." - STRING_LOAD_RICHED_FAILED, "RichEdit 裝載失敗." - STRING_SAVE_LOSEFORMATTING, "你已經選擇儲存為文本檔案, 這可能導致格式丟失. 你確定要這麼做嗎?" - STRING_INVALID_NUMBER, "數字格式無效" - STRING_OLE_STORAGE_NOT_SUPPORTED, "不支援OLE 儲存檔案" - STRING_WRITE_FAILED, "不能儲存檔案." - STRING_WRITE_ACCESS_DENIED, "你沒有儲存檔案的權力." - STRING_OPEN_FAILED, "不能開啟檔案." - STRING_OPEN_ACCESS_DENIED, "你沒有開啟檔案的權力." - STRING_PRINTING_NOT_IMPLEMENTED, "列印未實現。" - STRING_MAX_TAB_STOPS, "不能添加超過 32 的定位停駐點。" + STRING_DEFAULT_FILENAME, "文件" + STRING_PROMPT_SAVE_CHANGES, "儲存變更到 '%s'?" + STRING_SEARCH_FINISHED, "檔案搜尋結束。" + STRING_LOAD_RICHED_FAILED, "RichEdit 載入失敗。" + STRING_SAVE_LOSEFORMATTING, "您已經選擇儲存為純文字格式, 這可能導致格式遺失。您確定要這麼做嗎？" + STRING_INVALID_NUMBER, "無效的數字格式。" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE 儲存體文件未被支援。" + STRING_WRITE_FAILED, "無法儲存檔案。" + STRING_WRITE_ACCESS_DENIED, "您沒有儲存檔案的權限。" + STRING_OPEN_FAILED, "無法開啟檔案。" + STRING_OPEN_ACCESS_DENIED, "您沒有開啟檔案的權限。" + STRING_PRINTING_NOT_IMPLEMENTED, "列印功能尚未實作。" + STRING_MAX_TAB_STOPS, "無法加入超過 32 個定位停駐點。" END IDD_DATETIME DIALOGEX 30, 20, 130, 80 @@ -208,10 +209,10 @@ END IDD_NEWFILE DIALOGEX 30, 20, 140, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "新建" +CAPTION "新增" FONT 9, "新細明體" BEGIN - LTEXT "新檔案類型",-1,3,2,100,15 + LTEXT "新文件類型",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT DEFPUSHBUTTON "確定(&O)",IDOK,97,12,40,12 PUSHBUTTON "取消(&C)",IDCANCEL,97,26,40,12 @@ -258,10 +259,10 @@ BEGIN RADIOBUTTON "不換行(&N)", IDC_PAGEFMT_WN, 10, 25, 138, 15 RADIOBUTTON "按視窗寬度(&W)", IDC_PAGEFMT_WW, 10, 45, 138, 15 RADIOBUTTON "按紙張寬度(&M)", IDC_PAGEFMT_WM, 10, 65, 138, 15 - GROUPBOX "工具欄", -1, 150, 10, 115, 85 - CHECKBOX "工具欄(&T)", IDC_PAGEFMT_TB, 165, 20, 80, 15 - CHECKBOX "格式工具欄(&F)", IDC_PAGEFMT_FB, 165, 38, 80, 15 + GROUPBOX "工具列", -1, 150, 10, 115, 85 + CHECKBOX "工具列(&T)", IDC_PAGEFMT_TB, 165, 20, 80, 15 + CHECKBOX "格式工具列(&F)", IDC_PAGEFMT_FB, 165, 38, 80, 15 CHECKBOX "標尺(&R)", IDC_PAGEFMT_RU, 165, 56, 80, 15 - CHECKBOX "狀態欄(&S)", IDC_PAGEFMT_SB, 165, 74, 80, 15 + CHECKBOX "狀態列(&S)", IDC_PAGEFMT_SB, 165, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END diff --git a/base/applications/write/lang/Zh.rc b/base/applications/write/lang/Zh.rc index 1ff92b3360e..c14a9ac9d9f 100644 --- a/base/applications/write/lang/Zh.rc +++ b/base/applications/write/lang/Zh.rc @@ -1,7 +1,8 @@ /* - * Simplified Chinese language support + * Chinese language support * - * Copyright (C) 2010 Cheer Xiao <xiaqqaix.at.gmail.com> + * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> + * Translation sync to Wine by 2021 Aobi Chan CL <eason066.at.gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,3 +30,10 @@ STRINGTABLE { IDS_FAILED, "启动写字板失败" } + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE +{ + IDS_FAILED, "啟動 Wordpad 時失敗" +} diff --git a/media/doc/For_Chinese_Translation.txt b/media/doc/For_Chinese_Translation.txt index 45c447383db..4e76c91aea7 100644 --- a/media/doc/For_Chinese_Translation.txt +++ b/media/doc/For_Chinese_Translation.txt @@ -1,13 +1,25 @@ The following material is addressed (in Chinese) to Chinese translators. ------------------------------------------------------------------------ - +(简体中文版本) 欢迎翻译 ReactOS ！在正式开始翻译之前，希望您可以注意以下几点以便更好地进行翻译。 1）Windows 的记事本会将 UTF-8 格式变成 UTF-8 BOM 格式。因此，请不要用记事本编辑 ReactOS 的文件，特别是翻译文件。您可以使用 Notepad++ 之类的第三方文本编辑器进行编辑。 2）请不要将 USERENV 和 SHELL32 里面所提到的路径擅自翻译成中文，里面一些路径是可以翻译的，但是也有很多的路径是不可以进行翻译的，翻译的话会产生程序兼容性问题。曾经有段时间 ReactOS 里的路径都变成了中文，笔者在运行某个程序的时候就出现了问题。 3）为了翻译的准确性，您可以适当参考 Windows 中的对应条目的翻译，但是请不要照搬 Windows 的翻译，或者大段抄袭。这样可能会产生版权争议导致法律问题。 -4）如果您是在 macOS 下进行翻译工作的，因为 macOS 的特性，子目录下面可能会产生 .DS_Store，所以需要在 git 提交前在代码根目录中执行 find . -name ".DS_Store" -depth -exec rm {} \; 以删除 .DS_Store +4）部份翻译文件并不跟随 "xx-YY.rc" 的语言命名规则，因此请在新增翻译文件前先确认是否已有相关文件。特別是从 Wine 搬运过来的文件，它们的 "(filename)_Zh.rc" 翻译文件大多都有繁体与简体并存的情况。 +5）如果您是在 macOS 下进行翻译工作的，因为 macOS 的特性，子目录下面可能会产生 .DS_Store，所以需要在 git 提交前在代码根目录中执行 find . -name ".DS_Store" -depth -exec rm {} \; 以删除 .DS_Store。祝您翻译愉快！ + +(繁體中文版本) +歡迎翻譯 ReactOS！在開始翻譯前，希望您可以注意以下幾點以便更好地翻譯︰ + +1）Windows 內置的記事本會將 UTF-8 格式變為 UTF-8 BOM 格式。因此，請不要用記事本編輯 ReactOS 的檔案，尤其是翻譯檔案。您可使用 Notepad++ 之類的第三方文字編輯器進行編輯。 +2）請勿將 USERENV 和 SHELL32 裡面所提到的路徑擅自翻譯為中文。很多的路徑都是不可以翻譯的（即便有一些路徑還是可以翻譯的），否則會產生程序兼容性問題。曾經有段時間 ReactOS 裡的路徑都變成了中文，筆者在運行某個程序的時候就出現了錯誤。 +3）為了翻譯的準確性，您可以適當參考 Windows 中的對應條目的翻譯，但請不要照搬 Windows 的翻譯或大量抄襲。這樣可能會產生版權爭議導致法律問題。 +4）部份翻譯檔案並不跟隨 "xx-YY.rc" 的語言命名規則，因此請在新增翻譯檔案前先行確定是否已有相關檔案。尤其是承襲自 Wine 的檔案，它們的 "(filename)_Zh.rc" 翻譯檔案大多都有繁體與簡體並存的情況。 +5）如果您是在 macOS 下進行翻譯工作的，因為 macOS 的特性，子目錄下面可能會產生 .DS_Store，所以需要在 git 提交前在代碼根目錄中執行 find . -name ".DS_Store" -depth - exec rm {} \; 以刪除 .DS_Store。 + +祝您翻譯愉快！ diff --git a/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc b/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc index 9a45c8af656..5b9a1431c72 100644 --- a/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc +++ b/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc @@ -47,7 +47,7 @@ END BEGIN POPUP "Popup" BEGIN - MENUITEM "新建項目(&N)\tCtrl+N", ID_NEW + MENUITEM "新增項目(&N)\tCtrl+N", ID_NEW MENUITEM SEPARATOR MENUITEM "編輯項目(&E)\tEnter", ID_EDIT MENUITEM SEPARATOR @@ -78,8 +78,8 @@ END IDD_ADD DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU -CAPTION "添加替代項目" -FONT 10, "新細明體" +CAPTION "新增替代項目" +FONT 9, "新細明體" BEGIN CONTROL "字型名稱(&N):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 CONTROL "", cmb1, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 6, 120, 120 @@ -94,7 +94,7 @@ END IDD_EDIT DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU CAPTION "編輯替代項目" -FONT 10, "新細明體" +FONT 9, "新細明體" BEGIN CONTROL "字型名稱(&N):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 CONTROL "", edt1, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_BORDER | WS_TABSTOP, 70, 6, 120, 14 diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/zh-TW.rc b/modules/rosapps/applications/sysutils/systeminfo/lang/zh-TW.rc new file mode 100644 index 00000000000..d84fbd79859 --- /dev/null +++ b/modules/rosapps/applications/sysutils/systeminfo/lang/zh-TW.rc @@ -0,0 +1,70 @@ +/* Translated by Aobi Chan CL (eason066(a)gmail.com) on 2021-01-19 */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "SYSTEMINFO [/S system [/U username [/P [password]]]] [/FO format] [/NH]\n\n\ +描述:\n\ + 此命令行工具允許管理員查詢基本系統配置資訊。\n\n\ +參數列表:\n\ + /S system 指定要連接的遠端系統。\n\n\ + /U [domain\\]user 指定執行命令的使用者。\n\n\ + /P [password] 指定執行命令的使用者的密碼。\n\ + 如果省略，則會出現輸入提示。\n\n\ + /FO format 指定結果的顯示格式。\n\ + 有效值: ""TABLE"", ""LIST"", ""CSV""。\n\n\ + /NH 指定不應在輸出中顯示的欄位標題。\n\ + 只對 ""TABLE"" 和 ""CSV"" 格式有效。\n\n\ + /? 顯示此說明/ 用法。\n\n\ +示例:\n\ + SYSTEMINFO\n\ + SYSTEMINFO /?\n\ + SYSTEMINFO /S system\n\ + SYSTEMINFO /S system /U user\n\ + SYSTEMINFO /S system /U domain\\user /P password /FO TABLE\n\ + SYSTEMINFO /S system /FO LIST\n\ + SYSTEMINFO /S system /FO CSV /NH\n" + +IDS_HOST_NAME, "主機名稱" +IDS_OS_NAME, "OS 名稱" +IDS_OS_VERSION, "OS 版本" +IDS_BUILD, "組建" +IDS_OS_BUILD_TYPE, "OS 組建類型" +IDS_REG_OWNER, "註冊的擁有者" +IDS_REG_ORG, "註冊的組織" +IDS_PRODUCT_ID, "產品識別碼" +IDS_INST_DATE, "安裝日期" +IDS_UP_TIME, "系統開機時間" +IDS_UP_TIME_FORMAT, "%u 日, %u 小時, %u 分鐘, %u 秒" +IDS_SYS_MANUFACTURER, "系統製造商" +IDS_SYS_MODEL, "系統型號" +IDS_SYS_TYPE, "系統類型" +IDS_PROCESSORS, "處理器" +IDS_PROCESSORS_FORMAT, "已安裝 %u 個處理器。" +IDS_BIOS_DATE, "BIOS 日期" +IDS_BIOS_VERSION, "BIOS 版本" +IDS_ROS_DIR, "ReactOS 目錄" +IDS_SYS_DIR, "系統目錄" +IDS_BOOT_DEV, "啟動裝置" +IDS_SYS_LOCALE, "系統地區設定" +IDS_INPUT_LOCALE, "輸入法地區設定" +IDS_TIME_ZONE, "時區" +IDS_TOTAL_PHYS_MEM, "實體記憶體總量" +IDS_AVAIL_PHISICAL_MEM, "可用實體記憶體" +IDS_VIRT_MEM_MAX, "虛擬記憶體: 最大大小" +IDS_VIRT_MEM_AVAIL, "虛擬記憶體: 可用" +IDS_VIRT_MEM_INUSE, "虛擬記憶體: 已使用" +IDS_PAGEFILE_LOC, "分頁檔位置" +IDS_DOMAIN, "網域" +IDS_NETWORK_CARDS, "網路卡" +IDS_NETWORK_CARDS_FORMAT, "已安裝 %u 。" +IDS_CONNECTION_NAME, "連接名稱" +IDS_STATUS, "狀態" +IDS_MEDIA_DISCONNECTED, "媒體連接已中斷" +IDS_DHCP_ENABLED, "DHCP 已啟用" +IDS_NO, "否" +IDS_IP_ADDRESSES, "IP 位址" + +END diff --git a/modules/rosapps/applications/sysutils/systeminfo/rsrc.rc b/modules/rosapps/applications/sysutils/systeminfo/rsrc.rc index 221bf355373..7590ee7cc3f 100644 --- a/modules/rosapps/applications/sysutils/systeminfo/rsrc.rc +++ b/modules/rosapps/applications/sysutils/systeminfo/rsrc.rc @@ -39,3 +39,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif diff --git a/modules/rosapps/applications/vcdcontroltool/lang/zh-TW.rc b/modules/rosapps/applications/vcdcontroltool/lang/zh-TW.rc index af212fe29c4..f15d94c891c 100644 --- a/modules/rosapps/applications/vcdcontroltool/lang/zh-TW.rc +++ b/modules/rosapps/applications/vcdcontroltool/lang/zh-TW.rc @@ -19,7 +19,7 @@ BEGIN EDITTEXT IDC_MAINSIZE, 88, 127, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP EDITTEXT IDC_MAINFREE, 88, 139, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP EDITTEXT IDC_MAINTOTAL, 88, 151, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "添加磁碟機(&A)", IDC_MAINADD, 183, 123, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "新增磁碟機(&A)", IDC_MAINADD, 183, 123, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "移除磁碟機(&R)", IDC_MAINREMOVE, 242, 123, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "掛接", IDC_MAINMOUNT, 183, 142, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "退出", IDC_MAINEJECT, 183, 161, 109, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP diff --git a/modules/rosapps/applications/winfile/lang/zh-TW.rc b/modules/rosapps/applications/winfile/lang/zh-TW.rc index 8ac37c09b5b..81fa5fe2f44 100644 --- a/modules/rosapps/applications/winfile/lang/zh-TW.rc +++ b/modules/rosapps/applications/winfile/lang/zh-TW.rc @@ -1,10 +1,11 @@ /* * WineFile - * Simplified and Traditional Chinese Language Support + * Traditional Chinese Language Support * * Copyright 2002 liuspider <liuspider(a)yahoo.com> * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> * Copyright 2018 Luo Yufan <njlyf2011(a)hotmail.com> + * Translation imported from Wine by 2021 Aobi Chan CL <eason066(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,9 +37,9 @@ IDM_WINEFILE MENU MENUITEM "開啟(&O)\tEnter", ID_ACTIVATE MENUITEM "移動(&M)...\tF7", ID_FILE_MOVE MENUITEM "複製(&C)...\tF8", ID_FILE_COPY - MENUITEM "位於剪貼板(&I)...\tF9", 118 + MENUITEM "位於剪貼簿(&I)...\tF9", 118 MENUITEM "刪除(&D)\tDel", ID_FILE_DELETE - MENUITEM "改名(&N)...", 109 + MENUITEM "重新命名(&N)...", 109 MENUITEM "屬性(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR MENUITEM "壓縮(&O)...", 119 @@ -49,7 +50,7 @@ IDM_WINEFILE MENU MENUITEM "配置檔案相關...", 103 MENUITEM SEPARATOR MENUITEM "建立目錄(&E)...", 111 - MENUITEM "查找(&H)...", 104 + MENUITEM "搜尋(&H)...", 104 MENUITEM "選擇檔案(&S)...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS @@ -65,16 +66,16 @@ IDM_WINEFILE MENU MENUITEM SEPARATOR MENUITEM "格式化(&)...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "建立系統盤(&M)...", -1 /*TODO*/ + MENUITEM "建立系統磁碟(&M)...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "連接網路磁碟機(&N)", ID_CONNECT_NETWORK_DRIVE - MENUITEM "中斷網路磁碟機(&D)", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM "連線至網路儲存裝置(&N)", ID_CONNECT_NETWORK_DRIVE + MENUITEM "從網路儲存裝置離線(&D)", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "共享為...", 254 MENUITEM "刪除共享(&R)...", 255 MENUITEM SEPARATOR - MENUITEM "選擇儲存槽(&S)...", 251 + MENUITEM "選擇儲存裝置(&S)...", 251 } POPUP "目錄(&D)" { @@ -102,19 +103,19 @@ IDM_WINEFILE MENU MENUITEM "按大小排列(&Z)", ID_VIEW_SORT_SIZE MENUITEM "按日期排列(&D)", ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "定製排列...", ID_VIEW_FILTER + MENUITEM "篩選依據...(&.)", ID_VIEW_FILTER } POPUP "選項(&O)" { MENUITEM "確定方式(&C)...", 501 MENUITEM "字型(&F)...", ID_SELECT_FONT - MENUITEM "定製工具條(&B)...", 512 + MENUITEM "定製工具列(&B)...", 512 MENUITEM SEPARATOR - MENUITEM "工具條(&T)", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "儲存槽列表(&D)", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "狀態欄(&S)", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "工具列(&T)", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "儲存裝置列表(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "狀態列(&S)", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "全屏(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "全螢幕(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR MENUITEM "啟動後最小化(&M)", 504 @@ -122,29 +123,132 @@ IDM_WINEFILE MENU } - POPUP "安全(&S)" { + POPUP "安全性(&S)" { MENUITEM "訪問(&A)...", 605 - MENUITEM "登錄(&L)...", 606 + MENUITEM "登入(&L)...", 606 MENUITEM "所有者(&O)...", 607 } - POPUP "窗口(&W)" { + POPUP "視窗(&W)" { MENUITEM "新增(&W)", ID_WINDOW_NEW MENUITEM "層疊\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "水平平鋪(&H)", ID_WINDOW_TILE_HORZ - MENUITEM "垂直平鋪(&)\tCtrl+F4", ID_WINDOW_TILE_VERT + MENUITEM "水平排列(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "縱向排列(&)\tCtrl+F4", ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS MENUITEM "自動排列", ID_WINDOW_AUTOSORT #endif MENUITEM "自動排列圖示(&S)", ID_WINDOW_ARRANGE - MENUITEM "刷新(&R)\tF5", ID_REFRESH + MENUITEM "重新整理(&R)\tF5", ID_REFRESH } POPUP "&?" { MENUITEM "說明主題(&H)\tF1", ID_HELP - MENUITEM "搜索說明(&S)...\tF1", ID_HELP + MENUITEM "搜尋說明(&S)...\tF1", ID_HELP MENUITEM "使用說明(&U)\tF1", ID_HELP_USING MENUITEM SEPARATOR MENUITEM "關於 Winefile(&A)...", ID_ABOUT } -} \ No newline at end of file +} + +IDD_SELECT_DESTINATION DIALOGEX 15, 13, 210, 63 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "選擇目的地" +FONT 9, "新細明體" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "路徑(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "確定", 1, 158, 6, 47, 14 + PUSHBUTTON "取消", 2, 158, 23, 47, 14 + PUSHBUTTON "瀏覽(&B)", 254, 158, 43, 47, 14 +} + +IDD_DIALOG_VIEW_TYPE DIALOGEX 15, 13, 161, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "依類型" +FONT 9, "新細明體" +BEGIN + LTEXT "名稱(&N):",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "檔案類型",-1,7,23,87,56 + CONTROL "目錄(&D)",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "程式(&P)",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "我的文件(&M)",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "其他檔案(&O)",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "顯示隱藏或系統檔(&S)",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "確定",IDOK,104,7,50,14 + PUSHBUTTON "取消",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOGEX 0, 0, 248, 215 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "屬性 %s" +FONT 9, "新細明體" +BEGIN + DEFPUSHBUTTON "確定",IDOK,191,7,50,14 + PUSHBUTTON "取消",IDCANCEL,191,29,50,14 + LTEXT "檔案名稱(&F):",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "完整路徑(&P):",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "最後修改:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "版本:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "著作權(&Y):",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "大小:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "屬性",-1,7,79,158,46 + CONTROL "唯讀(&R)",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "隱藏(&I)",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "保存(&A)",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "系統(&S)",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "壓縮(&C)",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "版本(&V) Information",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "字型設定套用中" + IDS_FONT_SEL_ERROR "選取新字型時發生錯誤。" +} + +STRINGTABLE +{ + IDS_WINEFILE "Wine 檔案管理員" + IDS_ERROR "錯誤" + IDS_ROOT_FS "根檔案系統" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "桌面" + IDS_SHELL "命令殼" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "尚未實作" + IDS_WINE_FILE "Wine 檔案" +} + +STRINGTABLE +{ + IDS_COL_NAME "名稱" + IDS_COL_SIZE "大小" + IDS_COL_CDATE "建立日期" + IDS_COL_ADATE "Date Added" + IDS_COL_MDATE "變更日期" + IDS_COL_IDX "索引/Inode" + IDS_COL_LINKS "連結" + IDS_COL_ATTR "屬性" + IDS_COL_SEC "安全性" + + IDS_FREE_SPACE_FMT "%2 中剩下 %1" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +}

1 0

[reactos] 01/01: [INF] Add Czech (cs-CZ), Slovak (sk-SK) and Esperanto (eo-AA) translations (#3446)
by Václav Zouzalík 07 Feb '21

07 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a194a2434d09d1bc476f… commit 5a194a2434d09d1bc476fe469da440316638d6e5 Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Thu Feb 4 20:46:21 2021 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Feb 8 00:06:25 2021 +0300 [INF] Add Czech (cs-CZ), Slovak (sk-SK) and Esperanto (eo-AA) translations (#3446) --- media/inf/defltsv.inf | 18 ++++++++++++++++++ media/inf/defltwk.inf | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/media/inf/defltsv.inf b/media/inf/defltsv.inf index e96497d06d5..9da45bcb77f 100644 --- a/media/inf/defltsv.inf +++ b/media/inf/defltsv.inf @@ -128,6 +128,12 @@ SceInfInteractive = "INTERACTIVE" SceInfGuest = "來賓" SceInfUsers = "使用者" +[Strings.0405] +SceInfAuthUsers = "Autentizovaní uživatelé" +SceInfInteractive = "INTERACTIVE" +SceInfGuest = "Host" +SceInfUsers = "Uživatelé" + [Strings.0407] SceInfAuthUsers = "Authentifizierte Benutzer" SceInfInteractive = "INTERAKTIV" @@ -158,6 +164,12 @@ SceInfInteractive = "INTERACTIVE" SceInfGuest = "Гость" SceInfUsers = "Пользователи" +[Strings.041b] +SceInfAuthUsers = "Autentizovaní používatelia" +SceInfInteractive = "INTERACTIVE" +SceInfGuest = "Hosť" +SceInfUsers = "Používatelia" + [Strings.041c] SceInfAuthUsers = "Përdorues vërtetuar" SceInfInteractive = "INTERAKTIVE" @@ -170,6 +182,12 @@ SceInfInteractive = "ETKLİEŞİMLİ" SceInfGuest = "Konuk" SceInfUsers = "Kullanıcılar" +[Strings.048f] +SceInfAuthUsers = "Aŭtentikigitaj uzantoj" +SceInfInteractive = "INTERACTIVE" +SceInfGuest = "Gasto" +SceInfUsers = "Uzantoj" + [Strings.0804] SceInfAuthUsers = "经过身份验证的用户" SceInfInteractive = "INTERACTIVE" diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index 95b565096f1..e634fc72783 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -127,6 +127,12 @@ SceInfInteractive = "INTERACTIVE" SceInfGuest = "來賓" SceInfUsers = "使用者" +[Strings.0405] +SceInfAuthUsers = "Autentizovaní uživatelé" +SceInfInteractive = "INTERACTIVE" +SceInfGuest = "Host" +SceInfUsers = "Uživatelé" + [Strings.0407] SceInfAuthUsers = "Authentifizierte Benutzer" SceInfInteractive = "INTERAKTIV" @@ -157,6 +163,12 @@ SceInfInteractive = "INTERACTIVE" SceInfGuest = "Гость" SceInfUsers = "Пользователи" +[Strings.041b] +SceInfAuthUsers = "Autentizovaní používatelia" +SceInfInteractive = "INTERACTIVE" +SceInfGuest = "Hosť" +SceInfUsers = "Používatelia" + [Strings.041c] SceInfAuthUsers = "Përdorues vërtetuar" SceInfInteractive = "INTERAKTIVE" @@ -169,6 +181,12 @@ SceInfInteractive = "ETKLİEŞİMLİ" SceInfGuest = "Konuk" SceInfUsers = "Kullanıcılar" +[Strings.048f] +SceInfAuthUsers = "Aŭtentikigitaj uzantoj" +SceInfInteractive = "INTERACTIVE" +SceInfGuest = "Gasto" +SceInfUsers = "Uzantoj" + [Strings.0804] SceInfAuthUsers = "经过身份验证的用户" SceInfInteractive = "INTERACTIVE"

1 0

[reactos] 01/01: [SYSSETUP] Make status dialog look like msgina status dialog (#2825)
by Yaroslav Kibysh 07 Feb '21

07 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c917caf723c539b02f3f1… commit c917caf723c539b02f3f12ce75f779b07dac6870 Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Sun Feb 7 21:36:55 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 7 20:36:55 2021 +0100 [SYSSETUP] Make status dialog look like msgina status dialog (#2825) * [SYSSETUP] Add msgina-like resources * [SYSSETUP] Add bitmaps functionality, remove progress bar * [SYSSETUP] Update resources * [SYSSETUP] Use DPRINT1 * [SYSSETUP:INSTALL] %d - %lu for GetLastError in DPRINT1 * [SYSSETUP:INSTALL] Check pDlgData for NULL value + add some comments --- dll/win32/syssetup/install.c | 113 +++++++++++++++++++++++++++++-- dll/win32/syssetup/lang/bg-BG.rc | 7 +- dll/win32/syssetup/lang/cs-CZ.rc | 7 +- dll/win32/syssetup/lang/da-DK.rc | 7 +- dll/win32/syssetup/lang/de-DE.rc | 7 +- dll/win32/syssetup/lang/el-GR.rc | 7 +- dll/win32/syssetup/lang/en-US.rc | 7 +- dll/win32/syssetup/lang/es-ES.rc | 7 +- dll/win32/syssetup/lang/et-EE.rc | 7 +- dll/win32/syssetup/lang/fi-FI.rc | 7 +- dll/win32/syssetup/lang/fr-FR.rc | 7 +- dll/win32/syssetup/lang/he-IL.rc | 7 +- dll/win32/syssetup/lang/hi-IN.rc | 7 +- dll/win32/syssetup/lang/hu-HU.rc | 7 +- dll/win32/syssetup/lang/id-ID.rc | 7 +- dll/win32/syssetup/lang/it-IT.rc | 7 +- dll/win32/syssetup/lang/ja-JP.rc | 7 +- dll/win32/syssetup/lang/lt-LT.rc | 7 +- dll/win32/syssetup/lang/nl-NL.rc | 7 +- dll/win32/syssetup/lang/no-NO.rc | 7 +- dll/win32/syssetup/lang/pl-PL.rc | 7 +- dll/win32/syssetup/lang/pt-BR.rc | 7 +- dll/win32/syssetup/lang/pt-PT.rc | 7 +- dll/win32/syssetup/lang/ro-RO.rc | 7 +- dll/win32/syssetup/lang/ru-RU.rc | 7 +- dll/win32/syssetup/lang/sk-SK.rc | 7 +- dll/win32/syssetup/lang/sq-AL.rc | 7 +- dll/win32/syssetup/lang/sv-SE.rc | 7 +- dll/win32/syssetup/lang/th-TH.rc | 7 +- dll/win32/syssetup/lang/tr-TR.rc | 7 +- dll/win32/syssetup/lang/uk-UA.rc | 7 +- dll/win32/syssetup/lang/zh-CN.rc | 7 +- dll/win32/syssetup/lang/zh-TW.rc | 7 +- dll/win32/syssetup/resource.h | 8 ++- dll/win32/syssetup/resources/line.bmp | Bin 0 -> 6254 bytes dll/win32/syssetup/resources/reactos.bmp | Bin 0 -> 89334 bytes dll/win32/syssetup/syssetup.rc | 2 + 37 files changed, 243 insertions(+), 104 deletions(-) diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index 348ca43d663..f0ce192f498 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -37,6 +37,16 @@ SetupStartService(LPCWSTR lpServiceName, BOOL bWait); HINF hSysSetupInf = INVALID_HANDLE_VALUE; ADMIN_INFO AdminInfo; +typedef struct _DLG_DATA +{ + HBITMAP hLogoBitmap; + HBITMAP hBarBitmap; + HWND hWndBarCtrl; + DWORD BarCounter; + DWORD BarWidth; + DWORD BarHeight; +} DLG_DATA, *PDLG_DATA; + /* FUNCTIONS ****************************************************************/ static VOID @@ -531,17 +541,112 @@ StatusMessageWindowProc( IN WPARAM wParam, IN LPARAM lParam) { + PDLG_DATA pDlgData; UNREFERENCED_PARAMETER(wParam); + pDlgData = (PDLG_DATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); + + /* pDlgData is required for each case except WM_INITDIALOG */ + if (uMsg != WM_INITDIALOG && pDlgData == NULL) return FALSE; + switch (uMsg) { case WM_INITDIALOG: { + BITMAP bm; WCHAR szMsg[256]; + /* Allocate pDlgData */ + pDlgData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pDlgData)); + if (pDlgData) + { + /* Set pDlgData to GWLP_USERDATA, so we can get it for new messages */ + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pDlgData); + + /* Load bitmaps */ + pDlgData->hLogoBitmap = LoadImageW(hDllInstance, + MAKEINTRESOURCEW(IDB_REACTOS), IMAGE_BITMAP, + 0, 0, LR_DEFAULTCOLOR); + + pDlgData->hBarBitmap = LoadImageW(hDllInstance, MAKEINTRESOURCEW(IDB_LINE), + IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + GetObject(pDlgData->hBarBitmap, sizeof(bm), &bm); + pDlgData->BarWidth = bm.bmWidth; + pDlgData->BarHeight = bm.bmHeight; + + if (pDlgData->hLogoBitmap && pDlgData->hBarBitmap) + { + if (SetTimer(hwndDlg, IDT_BAR, 20, NULL) == 0) + { + DPRINT1("SetTimer(IDT_BAR) failed: %lu\n", GetLastError()); + } + + /* Get the animation bar control */ + pDlgData->hWndBarCtrl = GetDlgItem(hwndDlg, IDC_BAR); + } + } + + /* Get and set status text */ if (!LoadStringW(hDllInstance, IDS_STATUS_INSTALL_DEV, szMsg, ARRAYSIZE(szMsg))) return FALSE; SetDlgItemTextW(hwndDlg, IDC_STATUSLABEL, szMsg); + + return TRUE; + } + + case WM_TIMER: + { + if (pDlgData->hBarBitmap) + { + /* + * Default rotation bar image width is 413 (same as logo) + * We can divide 413 by 7 without remainder + */ + pDlgData->BarCounter = (pDlgData->BarCounter + 7) % pDlgData->BarWidth; + InvalidateRect(pDlgData->hWndBarCtrl, NULL, FALSE); + UpdateWindow(pDlgData->hWndBarCtrl); + } + return TRUE; + } + + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT lpDis = (LPDRAWITEMSTRUCT)lParam; + + if (lpDis->CtlID != IDC_BAR) + { + return FALSE; + } + + if (pDlgData->hBarBitmap) + { + HDC hdcMem; + HGDIOBJ hOld; + DWORD off = pDlgData->BarCounter; + DWORD iw = pDlgData->BarWidth; + DWORD ih = pDlgData->BarHeight; + + hdcMem = CreateCompatibleDC(lpDis->hDC); + hOld = SelectObject(hdcMem, pDlgData->hBarBitmap); + BitBlt(lpDis->hDC, off, 0, iw - off, ih, hdcMem, 0, 0, SRCCOPY); + BitBlt(lpDis->hDC, 0, 0, off, ih, hdcMem, iw - off, 0, SRCCOPY); + SelectObject(hdcMem, hOld); + DeleteDC(hdcMem); + return TRUE; + } + return FALSE; + } + + case WM_DESTROY: + { + if (pDlgData->hBarBitmap) + { + KillTimer(hwndDlg, IDT_BAR); + } + + DeleteObject(pDlgData->hLogoBitmap); + DeleteObject(pDlgData->hBarBitmap); + HeapFree(GetProcessHeap(), 0, pDlgData); return TRUE; } } @@ -552,7 +657,7 @@ static DWORD WINAPI ShowStatusMessageThread( IN LPVOID lpParameter) { - HWND hWnd, hItem; + HWND hWnd; MSG Msg; UNREFERENCED_PARAMETER(lpParameter); @@ -566,12 +671,6 @@ ShowStatusMessageThread( ShowWindow(hWnd, SW_SHOW); - hItem = GetDlgItem(hWnd, IDC_STATUSPROGRESS); - if (hItem) - { - PostMessage(hItem, PBM_SETMARQUEE, TRUE, 40); - } - /* Message loop for the Status window */ while (GetMessage(&Msg, NULL, 0, 0)) { diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index b44ed78a87c..19cfc38c22e 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "Добре", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 81e8900915f..c088501a01e 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -141,13 +141,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index e0ef504d3ff..7159b92d21b 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -154,13 +154,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index db51991860f..c4c124b6a08 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "Schließen", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index a1591e40d72..170abdeaf9e 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index ee4deaa57f6..0660c4c41c4 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -154,13 +154,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index ac7c02d2517..9f8b03c48b2 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -144,13 +144,14 @@ BEGIN DEFPUSHBUTTON "Aceptar", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index d32aa2eb4bd..78e709380ae 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "Olgu", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Palun oota..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 6ebf43e9acf..ff3861bb9e2 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -154,13 +154,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index da8c984f089..24af64425c3 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 0427892aa4e..07ebe207ed9 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "אישור", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index 984694686d3..d84f00b7b24 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -142,13 +142,14 @@ BEGIN DEFPUSHBUTTON "ठीक", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index d0ccb457c08..7f7fb4f20c3 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -134,13 +134,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Kérem várjon..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 9a6174cd70b..ff848529a8b 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Mohon tunggu..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index fdbf25d98d2..e7eab20fbf4 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 19e65b7b706..82859a3b927 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index af6758fca4c..86823b22672 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -154,13 +154,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 41d051a2535..f636b1d9b5c 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 3b91ee6195e..292971ee1a5 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Vennligst vent..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index aaf74a18604..9c26f169236 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index aa53f8aac7d..38ebaefcf07 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Por favor aguarde..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index cd9a7862216..f6060d968ca 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -135,13 +135,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Por favor aguarde..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 0020754b2cd..9bdeac2c74d 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -144,13 +144,14 @@ BEGIN DEFPUSHBUTTON "Î&nchide", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 96fc1a15171..cf74da8f248 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -138,13 +138,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index ecdb07f61d1..a6e03a142b2 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -141,13 +141,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index 0fc1f13688a..a62635f8b5a 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -154,13 +154,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index 1c31d23d2f2..acbbd0cd301 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -154,13 +154,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 48f1156f2ae..211ecb24712 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -154,13 +154,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index 8c94f5a07c6..4934a9dadcc 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -137,13 +137,14 @@ BEGIN DEFPUSHBUTTON "Tamam", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index 4310bfb315c..68b1529e100 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -143,13 +143,14 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index dbce04d3cbc..513adaefc56 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -137,13 +137,14 @@ BEGIN DEFPUSHBUTTON "确定", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 066697b4f91..a6f4494bc99 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -160,13 +160,14 @@ BEGIN DEFPUSHBUTTON "確定", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 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 - LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS - CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index 57dcff258f1..f4f24462dff 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -24,6 +24,8 @@ #define IDB_LAUTUS 103 #define IDB_LUNAR 104 #define IDB_MIZU 105 +#define IDB_REACTOS 106 +#define IDB_LINE 107 #define IDI_ICON1 10 #define IDI_ICON2 11 @@ -78,7 +80,8 @@ #define IDD_STATUSWINDOW_DLG 2200 #define IDC_STATUSLABEL 2201 -#define IDC_STATUSPROGRESS 2202 +#define IDC_ROSLOGO 2202 +#define IDC_BAR 2503 #define IDD_PS2MOUSEPROPERTIES 2300 #define IDC_PS2MOUSESAMPLERATE 2301 @@ -161,3 +164,6 @@ #define IDS_DEFAULT 3906 #define IDR_GPL 4000 + +/* Timer ID for the animated dialog bar. */ +#define IDT_BAR 1 diff --git a/dll/win32/syssetup/resources/line.bmp b/dll/win32/syssetup/resources/line.bmp new file mode 100644 index 00000000000..08717d3cbe7 Binary files /dev/null and b/dll/win32/syssetup/resources/line.bmp differ diff --git a/dll/win32/syssetup/resources/reactos.bmp b/dll/win32/syssetup/resources/reactos.bmp new file mode 100644 index 00000000000..bfee4ff308f Binary files /dev/null and b/dll/win32/syssetup/resources/reactos.bmp differ diff --git a/dll/win32/syssetup/syssetup.rc b/dll/win32/syssetup/syssetup.rc index 7d002554769..ce7f4a460a9 100644 --- a/dll/win32/syssetup/syssetup.rc +++ b/dll/win32/syssetup/syssetup.rc @@ -22,6 +22,8 @@ IDB_CLASSIC BITMAP "resources/thmclassic.bmp" IDB_LAUTUS BITMAP "resources/thmlautus.bmp" IDB_LUNAR BITMAP "resources/thmlunar.bmp" IDB_MIZU BITMAP "resources/thmmizu.bmp" +IDB_REACTOS BITMAP "resources/reactos.bmp" +IDB_LINE BITMAP "resources/line.bmp" IDI_ICON1 ICON "resources/1.ico" IDI_ICON2 ICON "resources/2.ico"

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2021