Ros-diffs January 2021

ros-diffs@reactos.org

15 participants
146 discussions

[reactos] 01/09: [DEVMGR] Remove no longer needed hack CORE-5643

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b816918063b87a17b00b… commit 0b816918063b87a17b00b536f262baf97ea67076 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Dec 10 01:20:27 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Jan 27 05:15:03 2021 +0300 [DEVMGR] Remove no longer needed hack CORE-5643 This reverts commit f9739601b380b9bd8ab43d8fa87c940c65517d94. --- dll/win32/devmgr/devmgmt/DeviceView.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dll/win32/devmgr/devmgmt/DeviceView.cpp b/dll/win32/devmgr/devmgmt/DeviceView.cpp index 8a59b6ef85e..1bb0fab7dee 100644 --- a/dll/win32/devmgr/devmgmt/DeviceView.cpp +++ b/dll/win32/devmgr/devmgmt/DeviceView.cpp @@ -1203,11 +1203,6 @@ CDeviceView::RefreshDeviceList() // create a new device node and add it to the list DeviceNode = new CDeviceNode(DeviceInfoData.DevInst, &m_ImageListData); - /* FIXME: Start of Hack for CORE-5643 */ - if (!DeviceNode->IsInstalled()) - continue; - /* FIXME: End of Hack for CORE-5643 */ - if (DeviceNode->SetupNode()) { m_DeviceNodeList.AddTail(DeviceNode);

3 years, 11 months

[reactos] 01/01: [SYSSETUP][INF] Add lockout setup to the security profile

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0caa5c0aeed5f20b4af1… commit c0caa5c0aeed5f20b4af12f1fdcd46f1db6db0d2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 24 21:35:33 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 24 21:35:33 2021 +0100 [SYSSETUP][INF] Add lockout setup to the security profile --- dll/win32/syssetup/security.c | 141 ++++++++++++++++++++++++++++++++++++++++++ media/inf/defltsv.inf | 6 ++ media/inf/defltwk.inf | 6 ++ 3 files changed, 153 insertions(+) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index d92c201831d..4a2f0b41e29 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -19,6 +19,7 @@ #include <debug.h> #define TICKS_PER_DAY -864000000000LL +#define TICKS_PER_SECOND -600000000LL /* FUNCTIONS ****************************************************************/ @@ -962,6 +963,145 @@ done: } +static +VOID +ApplyLockoutSettings( + _In_ HINF hSecurityInf, + _In_ PWSTR pszSectionName) +{ + INFCONTEXT InfContext; + DOMAIN_LOCKOUT_INFORMATION LockoutInfo; + PPOLICY_ACCOUNT_DOMAIN_INFO OrigInfo = NULL; + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle = NULL; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + INT nValue; + NTSTATUS Status; + + DPRINT("ApplyLockoutSettings()\n"); + + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); + ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_VIEW_LOCAL_INFORMATION | POLICY_TRUST_ADMIN, + &PolicyHandle); + if (Status != STATUS_SUCCESS) + { + DPRINT1("LsaOpenPolicy() failed (Status: 0x%08lx)\n", Status); + return; + } + + Status = LsaQueryInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, + (PVOID *)&OrigInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsaQueryInformationPolicy() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamConnect(NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamConnect() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamOpenDomain(ServerHandle, + DOMAIN_READ_PASSWORD_PARAMETERS | DOMAIN_WRITE_PASSWORD_PARAMS, + OrigInfo->DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamOpenDomain() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamQueryInformationDomain(DomainHandle, + DomainLockoutInformation, + (PVOID*)&LockoutInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamQueryInformationDomain() failed (Status %08lx)\n", Status); + goto done; + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"LockoutBadCount", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + if (nValue >= 0) + { + LockoutInfo.LockoutThreshold = nValue; + } + } + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"ResetLockoutCount", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + if (nValue >= 0) + { + LockoutInfo.LockoutObservationWindow.QuadPart = (LONGLONG)nValue * TICKS_PER_SECOND; + } + } + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"LockoutDuration", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + if (nValue == -1) + { + LockoutInfo.LockoutDuration.QuadPart = 0x8000000000000000LL; + } + else if ((nValue >= 0) && (nValue < 100000)) + { + LockoutInfo.LockoutDuration.QuadPart = (LONGLONG)nValue * TICKS_PER_SECOND; + } + } + } + + Status = SamSetInformationDomain(DomainHandle, + DomainLockoutInformation, + (PVOID*)&LockoutInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamSetInformationDomain() failed (Status %08lx)\n", Status); + goto done; + } + +done: + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + if (OrigInfo != NULL) + LsaFreeMemory(OrigInfo); + + if (PolicyHandle != NULL) + LsaClose(PolicyHandle); +} + + static VOID ApplyAuditEvents( @@ -1129,6 +1269,7 @@ InstallSecurity(VOID) ApplyEventlogSettings(hSecurityInf, L"System Log", L"System"); ApplyPasswordSettings(hSecurityInf, L"System Access"); + ApplyLockoutSettings(hSecurityInf, L"System Access"); ApplyAuditEvents(hSecurityInf); diff --git a/media/inf/defltsv.inf b/media/inf/defltsv.inf index ce3b7d78ba6..8aba23b7a60 100644 --- a/media/inf/defltsv.inf +++ b/media/inf/defltsv.inf @@ -5,6 +5,7 @@ Signature = "$Windows NT$" [System Access] +; Password Options MinimumPasswordAge = 0 MaximumPasswordAge = 42 MinimumPasswordLength = 0 @@ -13,6 +14,11 @@ PasswordHistorySize = 0 RequireLogonToChangePassword = 0 ClearTextPassword = 0 +; Lockout Options +LockoutBadCount = 0 +;ResetLockoutCount = 30 +;LockoutDuration = 30 + [Application Log] MaximumLogSize = 16384 AuditLogRetentionPeriod = 0 diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index 020b59c4d26..2996a6d94ed 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -5,6 +5,7 @@ Signature = "$Windows NT$" [System Access] +; Password Options MinimumPasswordAge = 0 MaximumPasswordAge = 42 MinimumPasswordLength = 0 @@ -13,6 +14,11 @@ PasswordHistorySize = 0 RequireLogonToChangePassword = 0 ClearTextPassword = 0 +; Lockout Options +LockoutBadCount = 0 +;ResetLockoutCount = 30 +;LockoutDuration = 30 + [Application Log] MaximumLogSize = 512 AuditLogRetentionPeriod = 1

3 years, 11 months

[reactos] 01/01: [SYSSETUP][INF] Add password setup to the security profile

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83f3bd8bd646c73ed99d3… commit 83f3bd8bd646c73ed99d3b6595b2d54e7c5ae543 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 24 15:28:23 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 24 15:28:23 2021 +0100 [SYSSETUP][INF] Add password setup to the security profile --- dll/win32/syssetup/security.c | 208 ++++++++++++++++++++++++++++++++++++++++++ media/inf/defltsv.inf | 9 ++ media/inf/defltwk.inf | 11 ++- 3 files changed, 227 insertions(+), 1 deletion(-) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index ff2c329dc2e..d92c201831d 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -18,6 +18,8 @@ #define NDEBUG #include <debug.h> +#define TICKS_PER_DAY -864000000000LL + /* FUNCTIONS ****************************************************************/ NTSTATUS @@ -756,6 +758,210 @@ ApplyEventlogSettings( } +static +VOID +ApplyPasswordSettings( + _In_ HINF hSecurityInf, + _In_ PWSTR pszSectionName) +{ + INFCONTEXT InfContext; + DOMAIN_PASSWORD_INFORMATION PasswordInfo; + PPOLICY_ACCOUNT_DOMAIN_INFO OrigInfo = NULL; + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle = NULL; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + INT nValue; + NTSTATUS Status; + + DPRINT("ApplyPasswordSettings()\n"); + + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); + ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_VIEW_LOCAL_INFORMATION | POLICY_TRUST_ADMIN, + &PolicyHandle); + if (Status != STATUS_SUCCESS) + { + DPRINT1("LsaOpenPolicy() failed (Status: 0x%08lx)\n", Status); + return; + } + + Status = LsaQueryInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, + (PVOID *)&OrigInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsaQueryInformationPolicy() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamConnect(NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamConnect() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamOpenDomain(ServerHandle, + DOMAIN_READ_PASSWORD_PARAMETERS | DOMAIN_WRITE_PASSWORD_PARAMS, + OrigInfo->DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamOpenDomain() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamQueryInformationDomain(DomainHandle, + DomainPasswordInformation, + (PVOID*)&PasswordInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamQueryInformationDomain() failed (Status %08lx)\n", Status); + goto done; + } + + DPRINT("MaximumPasswordAge (OldValue) : 0x%I64x\n", PasswordInfo.MaxPasswordAge.QuadPart); + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"MaximumPasswordAge", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + DPRINT("Value: %ld\n", nValue); + if (nValue == -1) + { + PasswordInfo.MaxPasswordAge.QuadPart = 0x8000000000000000; + } + else if ((nValue >= 1) && (nValue < 1000)) + { + PasswordInfo.MaxPasswordAge.QuadPart = (LONGLONG)nValue * TICKS_PER_DAY; + } + DPRINT("MaximumPasswordAge (NewValue) : 0x%I64x\n", PasswordInfo.MaxPasswordAge.QuadPart); + } + } + + DPRINT("MinimumPasswordAge (OldValue) : 0x%I64x\n", PasswordInfo.MinPasswordAge.QuadPart); + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"MinimumPasswordAge", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + DPRINT("Wert: %ld\n", nValue); + if ((nValue >= 0) && (nValue < 1000)) + { + if (PasswordInfo.MaxPasswordAge.QuadPart < (LONGLONG)nValue * TICKS_PER_DAY) + PasswordInfo.MinPasswordAge.QuadPart = (LONGLONG)nValue * TICKS_PER_DAY; + } + DPRINT("MinimumPasswordAge (NewValue) : 0x%I64x\n", PasswordInfo.MinPasswordAge.QuadPart); + } + } + + DPRINT("MinimumPasswordLength (OldValue) : %lu\n", PasswordInfo.MinPasswordLength); + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"MinimumPasswordLength", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + DPRINT("Value: %ld\n", nValue); + if ((nValue >= 0) && (nValue <= 65535)) + { + PasswordInfo.MinPasswordLength = nValue; + } + DPRINT("MinimumPasswordLength (NewValue) : %lu\n", PasswordInfo.MinPasswordLength); + } + } + + DPRINT("PasswordHistoryLength (OldValue) : %lu\n", PasswordInfo.PasswordHistoryLength); + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"PasswordHistorySize", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + DPRINT("Value: %ld\n", nValue); + if ((nValue >= 0) && (nValue <= 65535)) + { + PasswordInfo.PasswordHistoryLength = nValue; + } + DPRINT("PasswordHistoryLength (NewValue) : %lu\n", PasswordInfo.PasswordHistoryLength); + } + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"PasswordComplexity", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + if (nValue == 0) + { + PasswordInfo.PasswordProperties &= ~DOMAIN_PASSWORD_COMPLEX; + } + else + { + PasswordInfo.PasswordProperties |= DOMAIN_PASSWORD_COMPLEX; + } + } + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"ClearTextPassword", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + if (nValue == 0) + { + PasswordInfo.PasswordProperties &= ~DOMAIN_PASSWORD_STORE_CLEARTEXT; + } + else + { + PasswordInfo.PasswordProperties |= DOMAIN_PASSWORD_STORE_CLEARTEXT; + } + } + } + + /* Windows ignores the RequireLogonToChangePassword option */ + + Status = SamSetInformationDomain(DomainHandle, + DomainPasswordInformation, + (PVOID*)&PasswordInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamSetInformationDomain() failed (Status %08lx)\n", Status); + goto done; + } + +done: + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + if (OrigInfo != NULL) + LsaFreeMemory(OrigInfo); + + if (PolicyHandle != NULL) + LsaClose(PolicyHandle); +} + + static VOID ApplyAuditEvents( @@ -922,6 +1128,8 @@ InstallSecurity(VOID) ApplyEventlogSettings(hSecurityInf, L"Security Log", L"Security"); ApplyEventlogSettings(hSecurityInf, L"System Log", L"System"); + ApplyPasswordSettings(hSecurityInf, L"System Access"); + ApplyAuditEvents(hSecurityInf); SetupCloseInfFile(hSecurityInf); diff --git a/media/inf/defltsv.inf b/media/inf/defltsv.inf index d64c30d339a..ce3b7d78ba6 100644 --- a/media/inf/defltsv.inf +++ b/media/inf/defltsv.inf @@ -4,6 +4,15 @@ [Version] Signature = "$Windows NT$" +[System Access] +MinimumPasswordAge = 0 +MaximumPasswordAge = 42 +MinimumPasswordLength = 0 +PasswordComplexity = 0 +PasswordHistorySize = 0 +RequireLogonToChangePassword = 0 +ClearTextPassword = 0 + [Application Log] MaximumLogSize = 16384 AuditLogRetentionPeriod = 0 diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index 540edd39416..020b59c4d26 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -4,6 +4,15 @@ [Version] Signature = "$Windows NT$" +[System Access] +MinimumPasswordAge = 0 +MaximumPasswordAge = 42 +MinimumPasswordLength = 0 +PasswordComplexity = 0 +PasswordHistorySize = 0 +RequireLogonToChangePassword = 0 +ClearTextPassword = 0 + [Application Log] MaximumLogSize = 512 AuditLogRetentionPeriod = 1 @@ -38,8 +47,8 @@ SeAuditPrivilege = *S-1-5-19, *S-1-5-20 SeBackupPrivilege = *S-1-5-32-544, *S-1-5-32-551 SeBatchLogonRight = SeChangeNotifyPrivilege = *S-1-1-0, *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-551 -SeCreatePagefilePrivilege = *S-1-5-32-544 SeCreateGlobalPrivilege = *S-1-5-4, *S-1-5-6, *S-1-5-32-544 +SeCreatePagefilePrivilege = *S-1-5-32-544 SeCreatePermanentPrivilege = SeCreateTokenPrivilege = SeDebugPrivilege = *S-1-5-32-544

3 years, 11 months

[reactos] 01/01: [NTOS:MM] Fix compilation for amd64 port.

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f63401060d2de91f68816… commit f63401060d2de91f68816fe5c8a15ee4e48b6573 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jan 22 10:34:20 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Jan 22 10:34:20 2021 +0100 [NTOS:MM] Fix compilation for amd64 port. Addendum to 0919324772d288d2ae54df460b97c4577cf7e812 --- ntoskrnl/mm/amd64/page.c | 55 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/ntoskrnl/mm/amd64/page.c b/ntoskrnl/mm/amd64/page.c index 6b311fb34da..90a5d74b3b2 100644 --- a/ntoskrnl/mm/amd64/page.c +++ b/ntoskrnl/mm/amd64/page.c @@ -125,11 +125,11 @@ MiIsHyperspaceAddress(PVOID Address) } VOID -MiFlushTlb(PMMPTE Pte, PVOID Address) +MiFlushTlb(PMMPTE Pte, PVOID Address, KIRQL OldIrql) { if (MiIsHyperspaceAddress(Pte)) { - MmDeleteHyperspaceMapping((PVOID)PAGE_ROUND_DOWN(Pte)); + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); } else { @@ -142,16 +142,20 @@ PMMPTE MiGetPteForProcess( PEPROCESS Process, PVOID Address, - BOOLEAN Create) + BOOLEAN Create, + PKIRQL OldIrql +) { PMMPTE Pte; PMMPDE Pde; PMMPPE Ppe; PMMPXE Pxe; + *OldIrql = 0; /* Make sure the process is correct */ if (Address < MmSystemRangeStart) { + /* FIXME: Implement this case */ ASSERT(Process == PsGetCurrentProcess()); } else @@ -213,12 +217,13 @@ MiGetPteValueForProcess( { PMMPTE Pte; ULONG64 PteValue; + KIRQL OldIrql; - Pte = MiGetPteForProcess(Process, Address, FALSE); + Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); PteValue = Pte ? Pte->u.Long : 0; if (MiIsHyperspaceAddress(Pte)) - MmDeleteHyperspaceMapping((PVOID)PAGE_ROUND_DOWN(Pte)); + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); return PteValue; } @@ -303,7 +308,7 @@ MmIsDisabledPage(PEPROCESS Process, PVOID Address) MMPTE Pte; Pte.u.Long = MiGetPteValueForProcess(Process, Address); - return (Pte.u.Hard.Valid == 0) && + return (Pte.u.Hard.Valid == 0) && (Pte.u.Trans.Transition == 0) && (Pte.u.Hard.PageFrameNumber != 0); } @@ -358,8 +363,9 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) { PMMPTE Pte; MMPTE NewPte; + KIRQL OldIrql; - Pte = MiGetPteForProcess(Process, Address, FALSE); + Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); ASSERT(Pte != NULL); NewPte = *Pte; @@ -368,7 +374,7 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) InterlockedExchangePte(Pte, NewPte); - MiFlushTlb(Pte, Address); + MiFlushTlb(Pte, Address, OldIrql); } VOID @@ -376,8 +382,9 @@ NTAPI MmSetCleanPage(PEPROCESS Process, PVOID Address) { PMMPTE Pte; + KIRQL OldIrql; - Pte = MiGetPteForProcess(Process, Address, FALSE); + Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); if (!Pte) { KeBugCheckEx(MEMORY_MANAGEMENT, 0x1234, (ULONG64)Address, 0, 0); @@ -390,7 +397,7 @@ MmSetCleanPage(PEPROCESS Process, PVOID Address) __invlpg(Address); } - MiFlushTlb(Pte, Address); + MiFlushTlb(Pte, Address, OldIrql); } VOID @@ -398,8 +405,9 @@ NTAPI MmSetDirtyPage(PEPROCESS Process, PVOID Address) { PMMPTE Pte; + KIRQL OldIrql; - Pte = MiGetPteForProcess(Process, Address, FALSE); + Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); if (!Pte) { KeBugCheckEx(MEMORY_MANAGEMENT, 0x1234, (ULONG64)Address, 0, 0); @@ -412,7 +420,7 @@ MmSetDirtyPage(PEPROCESS Process, PVOID Address) __invlpg(Address); } - MiFlushTlb(Pte, Address); + MiFlushTlb(Pte, Address, OldIrql); } VOID @@ -426,8 +434,9 @@ MmDeleteVirtualMapping( PFN_NUMBER Pfn; PMMPTE Pte; MMPTE OldPte; + KIRQL OldIrql; - Pte = MiGetPteForProcess(Process, Address, FALSE); + Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); if (Pte) { @@ -454,7 +463,7 @@ MmDeleteVirtualMapping( if (Page) *Page = Pfn; - MiFlushTlb(Pte, Address); + MiFlushTlb(Pte, Address, OldIrql); } VOID @@ -463,8 +472,9 @@ MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, SWAPENTRY* SwapEntry) { PMMPTE Pte; + KIRQL OldIrql; - Pte = MiGetPteForProcess(Process, Address, FALSE); + Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); if (Pte == NULL) { *SwapEntry = 0; @@ -479,6 +489,9 @@ MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, *SwapEntry = Pte->u.Long >> 1; MI_ERASE_PTE(Pte); + + if (MiIsHyperspaceAddress(Pte)) + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); } NTSTATUS @@ -489,6 +502,7 @@ MmCreatePageFileMapping(PEPROCESS Process, { PMMPTE Pte; MMPTE PteValue; + KIRQL OldIrql; if (Process == NULL && Address < MmSystemRangeStart) { @@ -507,7 +521,7 @@ MmCreatePageFileMapping(PEPROCESS Process, } /* Allocate a PTE */ - Pte = MiGetPteForProcess(Process, Address, TRUE); + Pte = MiGetPteForProcess(Process, Address, TRUE, &OldIrql); if (Pte == NULL) { return STATUS_UNSUCCESSFUL; @@ -517,6 +531,9 @@ MmCreatePageFileMapping(PEPROCESS Process, PteValue.u.Long = SwapEntry << 1; MI_WRITE_INVALID_PTE(Pte, PteValue); + if (MiIsHyperspaceAddress(Pte)) + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); + return STATUS_UNSUCCESSFUL; } @@ -553,9 +570,11 @@ MmCreateVirtualMappingUnsafe( for (i = 0; i < PageCount; i++) { + KIRQL OldIrql; + TmplPte.u.Hard.PageFrameNumber = Pages[i]; - Pte = MiGetPteForProcess(Process, Address, TRUE); + Pte = MiGetPteForProcess(Process, Address, TRUE, &OldIrql); DPRINT("MmCreateVirtualMappingUnsafe, Address=%p, TmplPte=%p, Pte=%p\n", Address, TmplPte.u.Long, Pte); @@ -566,7 +585,7 @@ DPRINT("MmCreateVirtualMappingUnsafe, Address=%p, TmplPte=%p, Pte=%p\n", } if (MiIsHyperspaceAddress(Pte)) - MmDeleteHyperspaceMapping((PVOID)PAGE_ROUND_DOWN(Pte)); + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); Address = (PVOID)((ULONG64)Address + PAGE_SIZE); }

3 years, 11 months

[reactos] 02/02: [NTOS:MM] Get rid of "compatibility layer" for hyper space mappings

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0919324772d288d2ae54d… commit 0919324772d288d2ae54df460b97c4577cf7e812 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Dec 29 19:15:04 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Jan 22 09:33:06 2021 +0100 [NTOS:MM] Get rid of "compatibility layer" for hyper space mappings Let's call that a bug layer instead. --- ntoskrnl/include/internal/mm.h | 17 ---------- ntoskrnl/mm/ARM3/hypermap.c | 2 -- ntoskrnl/mm/i386/page.c | 77 +++++++++++++++++++++++------------------- 3 files changed, 43 insertions(+), 53 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index e34f2fbb856..d1754ec4f5c 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -993,10 +993,6 @@ MmZeroPageThread( ); /* hypermap.c *****************************************************************/ - -extern PEPROCESS HyperProcess; -extern KIRQL HyperIrql; - PVOID NTAPI MiMapPageInHyperSpace(IN PEPROCESS Process, @@ -1019,19 +1015,6 @@ NTAPI MiUnmapPagesInZeroSpace(IN PVOID VirtualAddress, IN PFN_NUMBER NumberOfPages); -// -// ReactOS Compatibility Layer -// -FORCEINLINE -PVOID -MmCreateHyperspaceMapping(IN PFN_NUMBER Page) -{ - HyperProcess = (PEPROCESS)KeGetCurrentThread()->ApcState.Process; - return MiMapPageInHyperSpace(HyperProcess, Page, &HyperIrql); -} - -#define MmDeleteHyperspaceMapping(x) MiUnmapPageInHyperSpace(HyperProcess, x, HyperIrql); - /* i386/page.c *********************************************************/ NTSTATUS diff --git a/ntoskrnl/mm/ARM3/hypermap.c b/ntoskrnl/mm/ARM3/hypermap.c index 6f7c32aa45e..4113814e6a6 100644 --- a/ntoskrnl/mm/ARM3/hypermap.c +++ b/ntoskrnl/mm/ARM3/hypermap.c @@ -20,8 +20,6 @@ PMMPTE MmFirstReservedMappingPte, MmLastReservedMappingPte; PMMPTE MiFirstReservedZeroingPte; MMPTE HyperTemplatePte; -PEPROCESS HyperProcess; -KIRQL HyperIrql; /* PRIVATE FUNCTIONS **********************************************************/ diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index 83c52423d5a..bcc2be911b1 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -134,12 +134,12 @@ ULONG MmProtectToValue[32] = /* FUNCTIONS ***************************************************************/ -static BOOLEAN MmUnmapPageTable(PULONG Pt); +static BOOLEAN MmUnmapPageTable(PULONG Pt, KIRQL OldIrql); VOID -MiFlushTlb(PULONG Pt, PVOID Address) +MiFlushTlb(PULONG Pt, PVOID Address, KIRQL OldIrql) { - if ((Pt && MmUnmapPageTable(Pt)) || Address >= MmSystemRangeStart) + if ((Pt && MmUnmapPageTable(Pt, OldIrql)) || Address >= MmSystemRangeStart) { KeInvalidateTlbEntry(Address); } @@ -203,7 +203,7 @@ MiFillSystemPageDirectory(IN PVOID Base, IN SIZE_T NumberOfBytes); static PULONG -MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) +MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create, PKIRQL OldIrql) { PFN_NUMBER Pfn; PULONG Pt; @@ -219,7 +219,9 @@ MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) PMMPDE PdeBase; ULONG PdeOffset = MiGetPdeOffset(Address); - PdeBase = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); + PdeBase = MiMapPageInHyperSpace(PsGetCurrentProcess(), + PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0]), + OldIrql); if (PdeBase == NULL) { KeBugCheck(MEMORY_MANAGEMENT); @@ -232,7 +234,7 @@ MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) if (!Create) { - MmDeleteHyperspaceMapping(PdeBase); + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), PdeBase, *OldIrql); return NULL; } @@ -253,8 +255,8 @@ MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) } Pfn = PointerPde->u.Hard.PageFrameNumber; - MmDeleteHyperspaceMapping(PdeBase); - Pt = MmCreateHyperspaceMapping(Pfn); + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), PdeBase, *OldIrql); + Pt = MiMapPageInHyperSpace(PsGetCurrentProcess(), Pfn, OldIrql); if (Pt == NULL) { KeBugCheck(MEMORY_MANAGEMENT); @@ -308,17 +310,15 @@ MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) return Pt; } -static BOOLEAN MmUnmapPageTable(PULONG Pt) +static BOOLEAN MmUnmapPageTable(PULONG Pt, KIRQL OldIrql) { if (!IS_HYPERSPACE(Pt)) { return TRUE; } - if (Pt) - { - MmDeleteHyperspaceMapping((PVOID)PAGE_ROUND_DOWN(Pt)); - } + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), Pt, OldIrql); + return FALSE; } @@ -326,12 +326,13 @@ static ULONG MmGetPageEntryForProcess(PEPROCESS Process, PVOID Address) { ULONG Pte; PULONG Pt; + KIRQL OldIrql; - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt) { Pte = *Pt; - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); return Pte; } return 0; @@ -363,11 +364,12 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, PFN_NUMBER Pfn; ULONG Pte; PULONG Pt; + KIRQL OldIrql; DPRINT("MmDeleteVirtualMapping(%p, %p, %p, %p)\n", Process, Address, WasDirty, Page); - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt == NULL) { @@ -395,7 +397,7 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, /* Flush the TLB since we transitioned this PTE * from valid to invalid so any stale translations * are removed from the cache */ - MiFlushTlb(Pt, Address); + MiFlushTlb(Pt, Address, OldIrql); if (Address < MmSystemRangeStart) { @@ -408,7 +410,7 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, } else { - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); Pfn = 0; } @@ -447,8 +449,9 @@ MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, { ULONG Pte; PULONG Pt; + KIRQL OldIrql; - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt == NULL) { @@ -470,7 +473,7 @@ MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, /* We don't need to flush here because page file entries * are invalid translations, so the processor won't cache them */ - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); if ((Pte & PA_PRESENT) || !(Pte & 0x800)) { @@ -512,6 +515,7 @@ MmSetCleanPage(PEPROCESS Process, PVOID Address) { PULONG Pt; ULONG Pte; + KIRQL OldIrql; if (Address < MmSystemRangeStart && Process == NULL) { @@ -519,7 +523,7 @@ MmSetCleanPage(PEPROCESS Process, PVOID Address) KeBugCheck(MEMORY_MANAGEMENT); } - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt == NULL) { KeBugCheck(MEMORY_MANAGEMENT); @@ -536,11 +540,11 @@ MmSetCleanPage(PEPROCESS Process, PVOID Address) } else if (Pte & PA_DIRTY) { - MiFlushTlb(Pt, Address); + MiFlushTlb(Pt, Address, OldIrql); } else { - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); } } @@ -550,6 +554,7 @@ MmSetDirtyPage(PEPROCESS Process, PVOID Address) { PULONG Pt; ULONG Pte; + KIRQL OldIrql; if (Address < MmSystemRangeStart && Process == NULL) { @@ -557,7 +562,7 @@ MmSetDirtyPage(PEPROCESS Process, PVOID Address) KeBugCheck(MEMORY_MANAGEMENT); } - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt == NULL) { KeBugCheck(MEMORY_MANAGEMENT); @@ -576,7 +581,7 @@ MmSetDirtyPage(PEPROCESS Process, PVOID Address) { /* The processor will never clear this bit itself, therefore * we do not need to flush the TLB here when setting it */ - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); } } @@ -612,6 +617,7 @@ MmCreatePageFileMapping(PEPROCESS Process, { PULONG Pt; ULONG Pte; + KIRQL OldIrql; if (Process == NULL && Address < MmSystemRangeStart) { @@ -629,7 +635,7 @@ MmCreatePageFileMapping(PEPROCESS Process, KeBugCheck(MEMORY_MANAGEMENT); } - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt == NULL) { /* Nobody should page out an address that hasn't even been mapped */ @@ -638,7 +644,7 @@ MmCreatePageFileMapping(PEPROCESS Process, { KeBugCheck(MEMORY_MANAGEMENT); } - Pt = MmGetPageTableForProcess(Process, Address, TRUE); + Pt = MmGetPageTableForProcess(Process, Address, TRUE, &OldIrql); } Pte = InterlockedExchangePte(Pt, SwapEntry << 1); if (Pte != 0) @@ -656,7 +662,7 @@ MmCreatePageFileMapping(PEPROCESS Process, /* We don't need to flush the TLB here because it * only caches valid translations and a zero PTE * is not a valid translation */ - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); return(STATUS_SUCCESS); } @@ -676,6 +682,8 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, ULONG oldPdeOffset, PdeOffset; PULONG Pt = NULL; ULONG Pte; + KIRQL OldIrql; + DPRINT("MmCreateVirtualMappingUnsafe(%p, %p, %lu, %p (%x), %lu)\n", Process, Address, flProtect, Pages, *Pages, PageCount); @@ -738,8 +746,8 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, PdeOffset = ADDR_TO_PDE_OFFSET(Addr); if (oldPdeOffset != PdeOffset) { - if(Pt) MmUnmapPageTable(Pt); - Pt = MmGetPageTableForProcess(Process, Addr, TRUE); + if(Pt) MmUnmapPageTable(Pt, OldIrql); + Pt = MmGetPageTableForProcess(Process, Addr, TRUE, &OldIrql); if (Pt == NULL) { KeBugCheck(MEMORY_MANAGEMENT); @@ -772,7 +780,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, } ASSERT(Addr > Address); - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); return(STATUS_SUCCESS); } @@ -852,6 +860,7 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) ULONG Attributes = 0; PULONG Pt; ULONG Pte; + KIRQL OldIrql; DPRINT("MmSetPageProtect(Process %p Address %p flProtect %x)\n", Process, Address, flProtect); @@ -868,7 +877,7 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) Attributes |= PA_USER; } - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt == NULL) { KeBugCheck(MEMORY_MANAGEMENT); @@ -883,9 +892,9 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) } if((Pte & Attributes) != Attributes) - MiFlushTlb(Pt, Address); + MiFlushTlb(Pt, Address, OldIrql); else - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); } CODE_SEG("INIT")

3 years, 11 months

[reactos] 01/02: [NTOS:MM] Allow "creating" a PDE in legacy Mm for foreign process

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57e8684bc60e9cf54105e… commit 57e8684bc60e9cf54105e0dcf6c3a13a621cde41 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jan 22 09:31:34 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Jan 22 09:32:36 2021 +0100 [NTOS:MM] Allow "creating" a PDE in legacy Mm for foreign process --- ntoskrnl/mm/i386/page.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index 336e65a3c45..83c52423d5a 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -219,10 +219,6 @@ MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) PMMPDE PdeBase; ULONG PdeOffset = MiGetPdeOffset(Address); - /* Nobody but page fault should ask for creating the PDE, - * Which imples that Process is the current one */ - ASSERT(Create == FALSE); - PdeBase = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); if (PdeBase == NULL) { @@ -231,13 +227,32 @@ MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) PointerPde = PdeBase + PdeOffset; if (PointerPde->u.Hard.Valid == 0) { - MmDeleteHyperspaceMapping(PdeBase); - return NULL; - } - else - { - Pfn = PointerPde->u.Hard.PageFrameNumber; + KAPC_STATE ApcState; + NTSTATUS Status; + + if (!Create) + { + MmDeleteHyperspaceMapping(PdeBase); + return NULL; + } + + KeStackAttachProcess(&Process->Pcb, &ApcState); + + Status = MiDispatchFault(0x1, + MiAddressToPte(Address), + MiAddressToPde(Address), + NULL, + FALSE, + Process, + NULL, + NULL); + + KeUnstackDetachProcess(&ApcState); + if (!NT_SUCCESS(Status)) + return NULL; } + + Pfn = PointerPde->u.Hard.PageFrameNumber; MmDeleteHyperspaceMapping(PdeBase); Pt = MmCreateHyperspaceMapping(Pfn); if (Pt == NULL)

3 years, 11 months

[reactos] 01/01: [MSVCRTEX] Do not include _CI* math functions

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af3527d4d2e616a6da82f… commit af3527d4d2e616a6da82fcfe13734c9fd1239790 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jan 21 09:43:04 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Jan 21 09:43:43 2021 +0100 [MSVCRTEX] Do not include _CI* math functions They are exported by msvcrt CORE-17423 --- sdk/lib/crt/msvcrtex.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 06bab6a5021..a9ebe297330 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -50,13 +50,6 @@ if(ARCH STREQUAL "i386") except/i386/chkstk_asm.s except/i386/chkstk_ms.s math/i386/alldiv_asm.s) - list(APPEND MSVCRTEX_SOURCE - math/i386/ci.c - math/i386/cicos.c - math/i386/cilog.c - math/i386/cipow.c - math/i386/cisin.c - math/i386/cisqrt.c) if (GCC AND CLANG) # CLang performs some optimisations requiring those funtions list(APPEND MSVCRTEX_ASM_SOURCE

3 years, 11 months

[reactos] 01/01: [SYSDM] Addendum CORE-17429

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e289ce0cc93ca385e71b… commit 4e289ce0cc93ca385e71bd9ab224069dd86dce2d Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jan 20 03:42:39 2021 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Jan 20 03:42:39 2021 +0100 [SYSDM] Addendum CORE-17429 This define in resource.h is also not needed anymore. --- dll/cpl/sysdm/resource.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index 94744806b0a..20481bf2fa1 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -209,5 +209,3 @@ #define IDC_LICENCEEDIT 1501 #define RC_LICENSE 1502 #define RTDATA 1503 - -#define IDS_DEVS 2000

3 years, 11 months

[reactos] 01/01: [SYSDM] Improve de-DE Uptime format translation

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a0246ef650fb3dce0982… commit 9a0246ef650fb3dce09829a3f1201ca7f403b1f9 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jan 20 03:16:07 2021 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Jan 20 03:16:07 2021 +0100 [SYSDM] Improve de-DE Uptime format translation I tried initially to use Tag(e) but that does look too crowded with the stuff after it. Since Windows is also not consistent with the () for singular vs plural, I did chose always plural "Tage". Most often people will see "0 Tage" anyway, and that fits well. --- dll/cpl/sysdm/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index aad3fc771e4..ec635f2e81e 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -319,7 +319,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%u Tage, %02u:%02u:%02u" IDS_VARIABLE "Variable" IDS_VALUE "Wert" IDS_NO_DUMP "(Keine)"

3 years, 11 months

[reactos] 01/01: [SYSDM] Fix version string cutoff CORE-17429

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be2518704e2c3d8b21e2e… commit be2518704e2c3d8b21e2edb469bd622b17b61619 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jan 20 02:45:44 2021 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Jan 20 02:45:44 2021 +0100 [SYSDM] Fix version string cutoff CORE-17429 The version string cutoff started to happen when we switched from SVN with its short revision number to git with the longer hashes. 0.4.7-dev-502-gc2c66af was the first git-only rev (2017-Oct-03) This brings the dialogs layout closer to XP. Also fixes some other truncations for specific languages. And unifies the touched text controls sizes for all languages. The credits have been moved to readme.txt where they are more present and we can avoid having to groom all languages files each time we want to add a new dev (and sysdm.cpl to grow each time). Less maintenance. 0.4.15-dev-1629-g9aa73da gcc 8.4.0 dbg RosBE2.2.1 I18N=all binary size sysdm.cpl before: 925.696bytes after: 705.024bytes readme.txt still fits into a single NTFS cluster afterwards with 3702bytes --- boot/bootdata/readme.txt | 81 +++++++++++++++-- dll/cpl/sysdm/general.c | 141 +---------------------------- dll/cpl/sysdm/lang/bg-BG.rc | 29 +++--- dll/cpl/sysdm/lang/cs-CZ.rc | 29 +++--- dll/cpl/sysdm/lang/da-DK.rc | 29 +++--- dll/cpl/sysdm/lang/de-DE.rc | 29 +++--- dll/cpl/sysdm/lang/el-GR.rc | 29 +++--- dll/cpl/sysdm/lang/en-US.rc | 29 +++--- dll/cpl/sysdm/lang/es-ES.rc | 29 +++--- dll/cpl/sysdm/lang/fr-FR.rc | 29 +++--- dll/cpl/sysdm/lang/he-IL.rc | 29 +++--- dll/cpl/sysdm/lang/hu-HU.rc | 29 +++--- dll/cpl/sysdm/lang/id-ID.rc | 29 +++--- dll/cpl/sysdm/lang/it-IT.rc | 29 +++--- dll/cpl/sysdm/lang/ja-JP.rc | 29 +++--- dll/cpl/sysdm/lang/nl-NL.rc | 29 +++--- dll/cpl/sysdm/lang/no-NO.rc | 29 +++--- dll/cpl/sysdm/lang/pl-PL.rc | 29 +++--- dll/cpl/sysdm/lang/pt-PT.rc | 29 +++--- dll/cpl/sysdm/lang/ro-RO.rc | 29 +++--- dll/cpl/sysdm/lang/ru-RU.rc | 29 +++--- dll/cpl/sysdm/lang/sk-SK.rc | 29 +++--- dll/cpl/sysdm/lang/sq-AL.rc | 29 +++--- dll/cpl/sysdm/lang/sv-SE.rc | 29 +++--- dll/cpl/sysdm/lang/tr-TR.rc | 29 +++--- dll/cpl/sysdm/lang/uk-UA.rc | 29 +++--- dll/cpl/sysdm/lang/zh-CN.rc | 29 +++--- dll/cpl/sysdm/lang/zh-TW.rc | 29 +++--- dll/cpl/sysdm/resources/rosbitmap.bmp | Bin 152694 -> 38454 bytes dll/cpl/sysdm/resources/rosbitmap_mask.bmp | Bin 51958 -> 13878 bytes 30 files changed, 442 insertions(+), 534 deletions(-) diff --git a/boot/bootdata/readme.txt b/boot/bootdata/readme.txt index cf8353a1a34..cb8d10902a4 100644 --- a/boot/bootdata/readme.txt +++ b/boot/bootdata/readme.txt @@ -1,6 +1,6 @@ ======================== ReactOS™ Version 0.4.x -Updated August 31, 2016 +Updated January 20, 2021 ======================== 1. What is ReactOS? @@ -70,8 +70,77 @@ In addition, the ReactOS forum: https://reactos.org/forum/ may contain complementary, yet non-official, information. -8. Authors ----------- - -This document was originally written by Jason Filby (jasonfilby(a)yahoo.com) -and is now occasionally updated by various contributors. +8. Authors and Credits +---------------------- + +Aleksandar Andrejevic +Aleksey Bragin +Alex Ionescu +Alexander Shaposhnikov +Amine Khaldi +Andrew Greenwood +Andrey Korotaev +Art Yerkes +Benedikt Freisen +Brandon Turner +Brian Palmer +Cameron Gutman +Casper Hornstrup +Christoph von Wittich +Colin Finck +Daniel Reimer +David Quintana +David Welch +Dmitry Chapyshev +Emanuele Aliberti +Eric Kohl +Filip Navara +Ged Murphy +Gé van Geldorp +Giannis Adamopoulos +Gregor Anich +Gregor Brunmar +Gunnar Dalsnes +Hermès Bélusca-Maïto +Hervé Poussineau +Jaix Bly +James Tabor +Jason Filby +Jeffrey Morlan +Jens Collin +Jérôme Gardou +Joachim Henze +Johannes Anderwald +Kamil Hornícek +Katayama Hirofumi MZ +KJK::Hyperion +Klemens Friedl +Maarten Bosma +Magnus Olsen +Marc Piulachs +Mark Jansen +Martin Fuchs +Matthias Kupfer +Michael Wirth +Mike Nordell +Mindflyer +Nathan Woods +Peter Hater +Peter Ward +Pierre Schweitzer +Rex Jolliff +Robert Dickenson +Royce Mitchell III +Saveliy Tretiakov +Stanislav Motylkov +Stefan Ginsberg +Sylvain Petreolle +Thomas Blümel +Thomas Faber +Timo Kreuzer +Vadim Galyant +Vizzini +Wierd_W +Z98 + +Further thanks go to all Contributors and the Wine Team diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 938cb820e8c..df68c092e00 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -135,135 +135,8 @@ Cleanup: LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - static UINT timerid = 0, top = 0, offset; - static HBITMAP hCreditsBitmap; - switch (uMsg) { - case WM_LBUTTONDBLCLK: - if (wParam & (MK_CONTROL | MK_SHIFT)) - { - if (timerid == 0) - { - HDC hCreditsDC, hLogoDC; - HDC hDC = GetDC(NULL); - HFONT hFont = NULL; - NONCLIENTMETRICS ncm; - RECT rcCredits; - TCHAR szCredits[2048]; - INT iDevsHeight; - - if (hDC == NULL) - goto Cleanup; - - top = 0; - offset = 0; - hCreditsDC = CreateCompatibleDC(hDC); - hLogoDC = CreateCompatibleDC(hCreditsDC); - - if (hCreditsDC == NULL || hLogoDC == NULL) - goto Cleanup; - - SetRect(&rcCredits, 0, 0, 0, 0); - - ncm.cbSize = sizeof(NONCLIENTMETRICS); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0); - - hFont = CreateFontIndirect(&ncm.lfMessageFont); - if (!hFont) - goto Cleanup; - SelectObject(hCreditsDC, hFont); - - LoadString(hApplet, IDS_DEVS, szCredits, sizeof(szCredits) / sizeof(TCHAR)); - DrawText(hCreditsDC, szCredits, -1, &rcCredits, DT_CALCRECT); - - iDevsHeight = rcCredits.bottom - rcCredits.top; - - hCreditsBitmap = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1, pImgInfo->iPlanes, pImgInfo->iBits, NULL); - - if (!hCreditsBitmap) - goto Cleanup; - - SelectObject(hLogoDC, pImgInfo->hBitmap); - SelectObject(hCreditsDC, hCreditsBitmap); - - offset += pImgInfo->cySource; - - SetRect(&rcCredits, 0, 0, pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1); - FillRect(hCreditsDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE)); - - SetRect(&rcCredits, 0, offset, pImgInfo->cxSource, offset + iDevsHeight + 1); - SetBkMode(hCreditsDC, TRANSPARENT); - - OffsetRect(&rcCredits, 1, 1); - SetTextColor(hCreditsDC, GetSysColor(COLOR_BTNSHADOW)); - DrawText(hCreditsDC, szCredits, -1, &rcCredits, DT_CENTER); - - OffsetRect(&rcCredits, -1, -1); - SetTextColor(hCreditsDC, GetSysColor(COLOR_WINDOWTEXT)); - DrawText(hCreditsDC, szCredits, -1, &rcCredits, DT_CENTER); - - offset += iDevsHeight; - - AlphaBlend(hCreditsDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc); - AlphaBlend(hCreditsDC, 0, offset, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc); - - timerid = SetTimer(hwnd, 1, ANIM_TIME, NULL); - -Cleanup: - if (hFont != NULL) DeleteObject(hFont); - if (hLogoDC != NULL) DeleteDC(hLogoDC); - if (hCreditsDC != NULL) DeleteDC(hCreditsDC); - if (hDC != NULL) ReleaseDC(NULL, hDC); - } - } - break; - case WM_LBUTTONDOWN: - if (timerid) - { - RECT rcCredits; - HDC hDC = GetDC(hwnd); - if (hDC != NULL) - { - GetClientRect(hwnd, &rcCredits); - SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource); - FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE)); - ReleaseDC(hwnd, hDC); - } - KillTimer(hwnd, timerid); - if (hCreditsBitmap != NULL) - DeleteObject(hCreditsBitmap); - - top = 0; - timerid = 0; - } - - InvalidateRect(hwnd, NULL, FALSE); - break; - case WM_TIMER: - top += ANIM_STEP; - - if (top > offset) - { - RECT rcCredits; - HDC hDC = GetDC(hwnd); - if (hDC != NULL) - { - GetClientRect(hwnd, &rcCredits); - SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource); - FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE)); - ReleaseDC(hwnd, hDC); - } - KillTimer(hwnd, timerid); - if (hCreditsBitmap != NULL) - DeleteObject(hCreditsBitmap); - - top = 0; - timerid = 0; - } - - InvalidateRect(hwnd, NULL, FALSE); - break; case WM_PAINT: { PAINTSTRUCT PS; @@ -280,17 +153,9 @@ Cleanup: if (hdcMem != NULL) { - if(timerid != 0) - { - SelectObject(hdcMem, hCreditsBitmap); - BitBlt(hdc, left, PS.rcPaint.top, PS.rcPaint.right - PS.rcPaint.left, PS.rcPaint.top + pImgInfo->cySource, hdcMem, 0, top, SRCCOPY); - } - else - { - SelectObject(hdcMem, pImgInfo->hBitmap); - AlphaBlend(hdc, left, PS.rcPaint.top, pImgInfo->cxSource, pImgInfo->cySource, hdcMem, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc); - } - + SelectObject(hdcMem, pImgInfo->hBitmap); + /* FIXME: We should not rely on AlphaBlend and we should not import MSIMG32 solely for that function */ + AlphaBlend(hdc, left, PS.rcPaint.top, pImgInfo->cxSource, pImgInfo->cySource, hdcMem, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc); DeleteDC(hdcMem); } diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index ee8647e713b..c873ac00011 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Общи" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Уредба:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Версия:", IDC_ROSVERSION, 10, 137, 131, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Машина:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Уредба:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Версия:", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Машина:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Посетете <A HREF=""https://reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Разрешителното", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,7 +339,6 @@ BEGIN IDS_PAGEFILE_NONE "Няма" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index a87f40e9c72..eb0d0e122e8 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -10,20 +10,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Obecné" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Systém:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Verze", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Počítač:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Systém:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Verze", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Počítač:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Navštívit <A HREF=""https://reactos.org/"">stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Zobrazit &licenci...", IDC_LICENCE, 170, 198, 78, 15 END @@ -344,7 +344,6 @@ BEGIN IDS_PAGEFILE_NONE "Není" IDS_PAGEFILE_SYSTEM "Spravováno systémem" IDS_INFOREBOOT "Změny se projeví po restartování počítače." - IDS_DEVS "\nTým ReactOS\n\nPKoordinátor\n\nAleksey Bragin\n\nVývojáři\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Ho [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Potvrďte smazání profilu" IDS_HWPROFILE_CONFIRM_DELETE "Opravdu chcete odstranit hardwarový profil ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "Zadané jméno profilu se již používá." diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index 0a9d6f3c862..9e3f06e021e 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generelt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Operativsystem:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Operativsystem:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Machine:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Visit the <A HREF=""https://reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,7 +339,6 @@ BEGIN IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index b6800123402..aad3fc771e4 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -14,20 +14,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "System:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Computer:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "System:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Computer:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "<A HREF=""https://reactos.org/"">ReactOS-Homepage</A> besuchen", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Lizenz anzeigen...", IDC_LICENCE, 170, 198, 78, 15 END @@ -348,7 +348,6 @@ BEGIN IDS_PAGEFILE_NONE "Keine" IDS_PAGEFILE_SYSTEM "Systemverwaltet" IDS_INFOREBOOT "Sie müssen den Computer neu starten, damit die Änderung wirksam wird." - IDS_DEVS "\nReactOS Team\n\nProjektkoordinator\n\nAleksey Bragin\n\nEntwicklerteam\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderw [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Löschen bestätigen" IDS_HWPROFILE_CONFIRM_DELETE "Sind Sie sicher, dass das Hardwareprofil ""%s"" gelöscht werden soll?" IDS_HWPROFILE_ALREADY_IN_USE "Der Profilname wird bereits verwendet." diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 1f884f97574..cd800feac4a 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Γενικά" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Σύστημα:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Έκδοση", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Υπολογιστής:", IDC_STATIC, 124, 116, 44, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Σύστημα:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Έκδοση", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Υπολογιστής:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Επισκευτείτε την <A HREF=""https://reactos.org/"">Ιστοσελίδα του ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Προβολή άδειας...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,7 +339,6 @@ BEGIN IDS_PAGEFILE_NONE "Κανένα" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index 1c041539b96..594e6b29166 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "System:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "System:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Machine:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Visit the <A HREF=""https://reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &license...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,7 +339,6 @@ BEGIN IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index 2f667bbb2d8..6f4cea10fe7 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Sistema operativo:", IDC_STATIC, 4, 116, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Versión", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "Tiempo de operación:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Equipo:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Sistema operativo:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Versión", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "Tiempo de operación:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Equipo:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Visite la <A HREF=""https://reactos.org/"">página Web de ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Ver &licencia...", IDC_LICENCE, 170, 198, 78, 15 END @@ -341,7 +341,6 @@ BEGIN IDS_PAGEFILE_NONE "Ninguno" IDS_PAGEFILE_SYSTEM "Administrado por el sistema" IDS_INFOREBOOT "Es necesario reiniciar el equipo para que se apliquen los cambios." - IDS_DEVS "\nEquipo de ReactOS\n\nCoordinador del proyecto\n\nAleksey Bragin\n\nEquipo de desarrollo\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirmar el borrado del perfil" IDS_HWPROFILE_CONFIRM_DELETE "¿Seguro que quiere borrar el perfil de hardware «%s»?" IDS_HWPROFILE_ALREADY_IN_USE "El nombre de perfil ya está en uso." diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index 825bd0c87a7..0149f137759 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Général" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Système d'exploitation :", IDC_STATIC, 4, 116, 75, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "Temps d'activité :", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Machine :", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Système d'exploitation :", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "Temps d'activité :", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Machine:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Visiter la <A HREF=""https://reactos.org/"">page d'accueil ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Voir la &licence...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,7 +339,6 @@ BEGIN IDS_PAGEFILE_NONE "Aucun" IDS_PAGEFILE_SYSTEM "Géré par le système" IDS_INFOREBOOT "Vous devez redémarrer le système pour appliquer les changements." - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirmation de suppression" IDS_HWPROFILE_CONFIRM_DELETE "Êtes-vous sûre de vouloir supprimer le profil matériel ""%s"" ?" IDS_HWPROFILE_ALREADY_IN_USE "Le nom de profil est déjà utilisé." diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index ff7c6c74f18..e2e0ced1e8a 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "כללי" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "מערכת:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "גרסה", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "מכונה:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "מערכת:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "גרסה", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "מכונה:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "בקר את <A HREF=""https://reactos.org/"">דף הבית של ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "ראה רישיון...", IDC_LICENCE, 170, 198, 78, 15 END @@ -341,7 +341,6 @@ BEGIN IDS_PAGEFILE_NONE "ללא" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index 5ce370811cc..191676d6b79 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Általános" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Operációs rendszer:", IDC_STATIC, 4, 116, 68, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Verzió", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "Rendszer üzemidő:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Számítógép:", IDC_STATIC, 124, 116, 40, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Operációs rendszer:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Verzió", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "Rendszer üzemidő:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Számítógép:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "A <A HREF=""https://reactos.org/"">ReactOS honlapjának</A> meglátogatása", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Licenc megtekintése...", IDC_LICENCE, 166, 198, 82, 15 END @@ -341,7 +341,6 @@ BEGIN IDS_PAGEFILE_NONE "nincs" IDS_PAGEFILE_SYSTEM "Rendszer által kezelt" IDS_INFOREBOOT "A változtatások életbe lépéséhez újra kell indítania a számítógépet." - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Profil törlésének megerősítése" IDS_HWPROFILE_CONFIRM_DELETE "Biztosan törölni szeretné a(z) ""%s"" hardverprofilt?" IDS_HWPROFILE_ALREADY_IN_USE "Ez a profilnév már használatban van." diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index d230820376a..54cfec53ae6 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Umum" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Sistem:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Versi", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "Waktu hidup sistem:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Mesin:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Sistem:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Versi", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "Waktu hidup sistem:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Mesin:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Kunjungi <A HREF=""https://reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Lihat &lisensi...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,7 +339,6 @@ BEGIN IDS_PAGEFILE_NONE "Tidak ada" IDS_PAGEFILE_SYSTEM "Diatur Sistem" IDS_INFOREBOOT "Anda harus memulai ulang komputer untuk menerapkan perubahan." - IDS_DEVS "\nReactOS Team\n\nKoordinator Proyek\n\nAleksey Bragin\n\nTim Pengembangan\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Ande [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Konfirmasi Penghapusan Profil" IDS_HWPROFILE_CONFIRM_DELETE "Anda yakin ingin menghapus profil perangkat keras ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "Nama profil telah digunakan." diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index a3b9b67cb48..e594ba6689b 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Sistema:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Versione", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "Tempo di Avvio Sistema:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Macchina:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Sistema:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Versione", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "Tempo di Avvio Sistema:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Macchina:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Visita <A HREF=""https://reactos.org/"">ReactOS su internet</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Vedi la licenza...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,7 +339,6 @@ BEGIN IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." - IDS_DEVS "\nReactOS Team\n\nCoordinatore\n\nAleksey Bragin\n\nGruppo di sviluppo\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwal [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 3999c837a49..6a926e71d0e 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "全般" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "システム:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "バージョン", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "起動してからの時間:", IDC_STATIC, 4, 148, 95, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "マシン:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "システム:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "バージョン", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "起動してからの時間:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "マシン:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "<A HREF=""https://reactos.org/"">ReactOS ホームページ</A>へ行く", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 150, 10 PUSHBUTTON "ライセンスを表示(&L)...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,7 +339,6 @@ BEGIN IDS_PAGEFILE_NONE "なし" IDS_PAGEFILE_SYSTEM "システム管理" IDS_INFOREBOOT "変更を適用するには、コンピュータを再起動する必要があります。" - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "プロファイル削除の確認" IDS_HWPROFILE_CONFIRM_DELETE "ハードウェアプロファイル ""%s"" を削除してもよいですか?" IDS_HWPROFILE_ALREADY_IN_USE "プロファイル名は使用中です。" diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 1bdd57389cd..5437d9f7b5b 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Algemeen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Besturingssysteem:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Versie", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Besturingssysteem:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Versie", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Machine:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Visit the <A HREF=""https://reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,7 +339,6 @@ BEGIN IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index 060461ba3d6..649a4a6bcf3 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generielt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "System:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Versjon", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Maskin:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "System:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Versjon", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Maskin:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Besøk <A HREF=""https://reactos.org/no/index.html"">ReactOS Hjemmesiden</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Vis &lisensen...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,7 +339,6 @@ BEGIN IDS_PAGEFILE_NONE "Ingen" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 454e119055f..6e1c4c9d41e 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -14,20 +14,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ogólne" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "System:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Wersja", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "Czas pracy systemu:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Komputer:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "System:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Wersja", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "Czas pracy systemu:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Komputer:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Odwiedź <A HREF=""https://reactos.org/"">Stronę domową ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Wyświetl &licencję...", IDC_LICENCE, 170, 198, 78, 15 END @@ -348,7 +348,6 @@ BEGIN IDS_PAGEFILE_NONE "Brak" IDS_PAGEFILE_SYSTEM "Kontrolowany przez system" IDS_INFOREBOOT "Musisz ponownie uruchomić komputer, aby zastosować zmiany." - IDS_DEVS "\nZespół ReactOS\n\nKoordynator Projektu\n\nAleksey Bragin\n\nZespół Programistów\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohann [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Potwierdź usunięcie profilu" IDS_HWPROFILE_CONFIRM_DELETE "Czy napewno chcesz usunąć profil sprzętu ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "Nazwa profilu jest już w użyciu." diff --git a/dll/cpl/sysdm/lang/pt-PT.rc b/dll/cpl/sysdm/lang/pt-PT.rc index 10b4bc218c1..5d3174cdb2e 100644 --- a/dll/cpl/sysdm/lang/pt-PT.rc +++ b/dll/cpl/sysdm/lang/pt-PT.rc @@ -9,20 +9,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Geral" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Sistema:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Versão", IDC_ROSVERSION, 10, 137, 120, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 130, 9 - LTEXT "Ultima actualização:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Computador:", IDC_STATIC, 135, 116, 40, 9 - LTEXT "", IDC_MACHINELINE1, 140, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 140, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 140, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 140, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 140, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 140, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Sistema:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Versão", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "Ultima actualização:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Computador:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Visite <A HREF=""https://reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 159, 10 PUSHBUTTON "Ver &licença...", IDC_LICENCE, 170, 198, 78, 15 END @@ -343,7 +343,6 @@ BEGIN IDS_PAGEFILE_NONE "Nenhum" IDS_PAGEFILE_SYSTEM "Sistema gerenciado" IDS_INFOREBOOT "Precisa reiniciar o computador para aplicar as alterações." - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirmar exclusão do perfil" IDS_HWPROFILE_CONFIRM_DELETE "Tem certeza de que deseja excluir o perfil de hardware ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "O nome do perfil já está em uso." diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index 3b54123c373..24e7c9db7eb 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -14,20 +14,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Sistem:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Versiune", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "Timp de operare:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Calculator:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Sistem:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Versiune", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "Timp de operare:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Calculator:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Vizitați<A HREF=""https://reactos.org/""> pagina web ReactOS </A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Licență…", IDC_LICENCE, 170, 198, 78, 15 END @@ -348,7 +348,6 @@ BEGIN IDS_PAGEFILE_NONE "Nespecificat" IDS_PAGEFILE_SYSTEM "Gestionat de sistem" IDS_INFOREBOOT "Pentru aplicarea modificărilor este necesară repornirea calculatorului." - IDS_DEVS "\nEchipa ReactOS\n\nCoordonator de proiect\n\nAleksey Bragin\n\nEchipa de dezvoltare\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJoh [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirmați eliminarea profilului" IDS_HWPROFILE_CONFIRM_DELETE "Sigur doriți eliminarea profilului de dispozitive „%s”?" IDS_HWPROFILE_ALREADY_IN_USE "Profilul este deja în uz." diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index e317bab9af2..6da46351bf6 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Общие" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Операционная система:", IDC_STATIC, 4, 116, 87, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Версия", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "Время работы системы:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Компьютер:", IDC_STATIC, 124, 116, 40, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Операционная система:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Версия", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "Время работы системы:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Компьютер:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Посетите <A HREF=""https://reactos.org/"">домашнюю страницу ReactOS</A>.", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Лицензия...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,7 +339,6 @@ BEGIN IDS_PAGEFILE_NONE "Нет" IDS_PAGEFILE_SYSTEM "По выбору системы" IDS_INFOREBOOT "Необходимо перезагрузить компьютер для применения изменений." - IDS_DEVS "\nКоманда ReactOS\n\nКоординатор проекта\n\nАлексей Брагин\n\nКоллектив разработчиков\n\nАлександр Андреевич\nАлексей Брагин\nАлександр Шапошников\nАмин Халди\nЭндрю Гринвуд\nАндрей Коротаев\nАрт Йеркс\nБенедикт Фрейзен\nКамерон Гутман\nКристоф фон Виттих\nКолин Финк\nДаниэль Раймер\nДэвид Кинтана\nДмитрий Чапышев\nЭрик Коль\nГед Мёрфи\nЯннис Адамопулос\nГрегор Брюнмар\nГермес Белуска-Майто\nЭрве Поссино\nДжеймс Тэбор\nДжеффри Морлан\nЖером Гарду\nЙоханнес Андервальд\nКамил [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Подтверждение удаления профиля" IDS_HWPROFILE_CONFIRM_DELETE "Вы уверены что хотите удалить профиль оборудования ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "Профиль с таким названием уже существует." diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index b4d0639832c..287f5aa9662 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -13,20 +13,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Všeobecné" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Systém:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Verzia", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Počítač:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Systém:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Verzia", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Počítač:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Navštívte <A HREF=""https://reactos.org/"">domovskú stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Zobraziť &licenciu...", IDC_LICENCE, 170, 198, 78, 15 END @@ -347,7 +347,6 @@ BEGIN IDS_PAGEFILE_NONE "Žiadne" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index cee888f41c4..261bac6756d 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Përgjithshëm" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Sistemi:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Versioni", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Makinë:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Sistemi:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Versioni", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Makinë:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Vizitoni <A HREF=""https://reactos.org/"">Faqeb ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Shiko &licencës...", IDC_LICENCE, 170, 198, 78, 15 END @@ -339,7 +339,6 @@ BEGIN IDS_PAGEFILE_NONE "Asnjë" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 048fc3a931e..c4e28232de7 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Allmänt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Operativsystem:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Dator:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Operativsystem:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Dator:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Besök <A HREF=""https://reactos.org/"">ReactOS hemsida</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Visa &licens...", IDC_LICENCE, 170, 198, 78, 15 END @@ -341,7 +341,6 @@ BEGIN IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 6a38ec18de9..e25cecfab5e 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Genel" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Sistem:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Sürüm:", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "Sistem Çalışma Zamanı:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Makine:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Sistem:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Sürüm:", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "Sistem Çalışma Zamanı:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Makine:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "<A HREF=""https://reactos.org/"">ReactOS Ana Sayfa</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Lisansı Göster...", IDC_LICENCE, 170, 198, 78, 15 END @@ -341,7 +341,6 @@ BEGIN IDS_PAGEFILE_NONE "Yok" IDS_PAGEFILE_SYSTEM "Sistem Yönetimli" IDS_INFOREBOOT "Değişiklikleri uygulamak için bilgisayarı yeniden başlatmalısınız." - IDS_DEVS "\nReactOS Takımı\n\nProje Koordinatörü:\n\nAleksey Bragin\n\nGeliştirme Takımı:\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Profil Silmeyi Onayla" IDS_HWPROFILE_CONFIRM_DELETE """%s"" donanım profilini silmeyi istemekten emin misiniz?" IDS_HWPROFILE_ALREADY_IN_USE "Profil adı zaten kullanımda." diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index bc2a408eb81..41b9d34be68 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -13,20 +13,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Загальні" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Операційна система:", IDC_STATIC, 4, 116, 82, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Версія", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Комп'ютер:", IDC_STATIC, 124, 132, 36, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "Операційна система:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "Версія", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "Комп'ютер:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "Відвідайте <A HREF=""https://reactos.org/"">домашню сторінку ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Ліцензія...", IDC_LICENCE, 170, 198, 78, 15 END @@ -347,7 +347,6 @@ BEGIN IDS_PAGEFILE_NONE "Немає" IDS_PAGEFILE_SYSTEM "За вибором системи" IDS_INFOREBOOT "Необхідно перезавантажити комп'ютер для застосування нових параметрів." - IDS_DEVS "\nКоманда ReactOS\n\nКординатор проекту\n\nОлексій Брагін\n\nКоманда розробників\n\nОлександр Андрійович\nОлексій Брагін\nОлександр Шапошніков\nАмін Халді\nЕндрю Грінвуд\nАндрій Коротаєв\nАрт Єркс\nБенедикт Фрейзен\nКамерон Гутман\nКрістоф фон Віттіх\nКолін Фінк\nДаніель Реймер\nДевід Кінтана\nДмитро Чапишев\nЕрік Коль\nГед Мерфі\nЯніс Адамопулос\nГрегор Брунмар\nГермес Белуска-Маіто\nЕрве Пуссіно\nДжеймс Табор\nДжеффрі Морлан\nЖером Гарду\nЙоганнес Андервальд\nКаміль Хорні [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Підтвердження видалення профілю" IDS_HWPROFILE_CONFIRM_DELETE "Ви дійсно хочете видалити профіль обладнання ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "Ім'я вже зайнято." diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 3ecff0f5636..4f80009f762 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -8,20 +8,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常规" FONT 9, "宋体", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "系统:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "版本", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "开机时间:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "计算机:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "系统:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "版本", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "开机时间:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "计算机:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "访问<A HREF=""https://reactos.org/"">ReactOS 主页</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "许可证(&L)...", IDC_LICENCE, 170, 198, 78, 15 END @@ -342,7 +342,6 @@ BEGIN IDS_PAGEFILE_NONE "无" IDS_PAGEFILE_SYSTEM "系统已托管" IDS_INFOREBOOT "您必须重新启动计算机，才能应用更改。" - IDS_DEVS "\nReactOS Team\n\n项目协调员\n\nAleksey Bragin\n\n开发组\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKat [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "确认配置文件删除" IDS_HWPROFILE_CONFIRM_DELETE "你确定你想要删除的硬件配置文件？ ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "配置式名称已在使用。" diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index abe5c107d67..3d4c162f84f 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -8,20 +8,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "一般" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "系統:", IDC_STATIC, 4, 116, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "版本", IDC_ROSVERSION, 10, 137, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "系統啟動時間:", IDC_STATIC, 4, 158, 86, 9 - LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "電腦:", IDC_STATIC, 124, 116, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 - LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111 + LTEXT "系統:", IDC_STATIC, 114, 16, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9 + LTEXT "版本", IDC_ROSVERSION, 120, 37, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9 + LTEXT "系統啟動時間:", IDC_STATIC, 114, 158, 95, 9 + LTEXT "", IDC_UPTIME, 120, 170, 116, 9 + LTEXT "電腦:", IDC_STATIC, 114, 75, 44, 9 + LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9 + LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9 + LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9 + LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9 + LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9 + LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9 CONTROL "請訪問<A HREF=""https://reactos.org/"">ReactOS 首頁</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "查看著作權信息(&L)...", IDC_LICENCE, 170, 198, 78, 15 END @@ -342,7 +342,6 @@ BEGIN IDS_PAGEFILE_NONE "無" IDS_PAGEFILE_SYSTEM "系統已管理" IDS_INFOREBOOT "您必須重新啓動電腦，才能套用更改。" - IDS_DEVS "\nReactOS 團隊\n\n項目協調員\n\nAleksey Bragin\n\n開發團隊\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKata [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "確認設定檔刪除" IDS_HWPROFILE_CONFIRM_DELETE "你確定你想要刪除的硬件設定檔？ ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "配置式名稱已在使用。" diff --git a/dll/cpl/sysdm/resources/rosbitmap.bmp b/dll/cpl/sysdm/resources/rosbitmap.bmp index ee5891c3ccc..10830dc590e 100644 Binary files a/dll/cpl/sysdm/resources/rosbitmap.bmp and b/dll/cpl/sysdm/resources/rosbitmap.bmp differ diff --git a/dll/cpl/sysdm/resources/rosbitmap_mask.bmp b/dll/cpl/sysdm/resources/rosbitmap_mask.bmp index 9e0ef218561..0b7d0820f1b 100644 Binary files a/dll/cpl/sysdm/resources/rosbitmap_mask.bmp and b/dll/cpl/sysdm/resources/rosbitmap_mask.bmp differ

3 years, 11 months

← Newer
1
2
3
4
5
6
7
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2021