Ros-diffs January 2019

ros-diffs@reactos.org

31 participants
300 discussions

[reactos] 01/01: [FONT][GDI32] Fix font enumeration functions (#1221)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e4e5a004c9da6276695d… commit 6e4e5a004c9da6276695d90187fb577812e8892f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 6 10:43:34 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 6 10:43:34 2019 +0900 [FONT][GDI32] Fix font enumeration functions (#1221) Fix EnumFonts, EnumFontFamilies and EnumFontFamiliesEx functions. The charsets of the font substitutes are also enumerated. Delete meaningless codes. CORE-15558 --- win32ss/gdi/gdi32/objects/font.c | 98 ++++++++++++++++++-- win32ss/gdi/ntgdi/freetype.c | 196 +++++++++------------------------------ 2 files changed, 136 insertions(+), 158 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/font.c b/win32ss/gdi/gdi32/objects/font.c index 38758fa790..566d703ccb 100644 --- a/win32ss/gdi/gdi32/objects/font.c +++ b/win32ss/gdi/gdi32/objects/font.c @@ -204,9 +204,88 @@ NewTextMetricExW2A(NEWTEXTMETRICEXA *tma, NEWTEXTMETRICEXW *tmw) tma->ntmFontSig = tmw->ntmFontSig; } +// IntFontFamilyCompareEx's flags +#define IFFCX_CHARSET 1 +#define IFFCX_STYLE 2 + +FORCEINLINE int FASTCALL +IntFontFamilyCompareEx(const FONTFAMILYINFO *ffi1, + const FONTFAMILYINFO *ffi2, DWORD dwCompareFlags) +{ + const LOGFONTW *plf1 = &ffi1->EnumLogFontEx.elfLogFont; + const LOGFONTW *plf2 = &ffi2->EnumLogFontEx.elfLogFont; + ULONG WeightDiff1, WeightDiff2; + int cmp = _wcsicmp(plf1->lfFaceName, plf2->lfFaceName); + if (cmp) + return cmp; + if (dwCompareFlags & IFFCX_STYLE) + { + WeightDiff1 = labs(plf1->lfWeight - FW_NORMAL); + WeightDiff2 = labs(plf2->lfWeight - FW_NORMAL); + if (WeightDiff1 < WeightDiff2) + return -1; + if (WeightDiff1 > WeightDiff2) + return 1; + if (plf1->lfItalic < plf2->lfItalic) + return -1; + if (plf1->lfItalic > plf2->lfItalic) + return 1; + } + if (dwCompareFlags & IFFCX_CHARSET) + { + if (plf1->lfCharSet < plf2->lfCharSet) + return -1; + if (plf1->lfCharSet > plf2->lfCharSet) + return 1; + } + return 0; +} + +static int __cdecl +IntFontFamilyCompare(const void *ffi1, const void *ffi2) +{ + return IntFontFamilyCompareEx(ffi1, ffi2, IFFCX_STYLE | IFFCX_CHARSET); +} + +// IntEnumFontFamilies' flags: +#define IEFF_UNICODE 1 +#define IEFF_EXTENDED 2 + +int FASTCALL +IntFontFamilyListUnique(FONTFAMILYINFO *InfoList, INT nCount, + const LOGFONTW *plf, DWORD dwFlags) +{ + FONTFAMILYINFO *first, *last, *result; + DWORD dwCompareFlags = 0; + + if (plf->lfFaceName[0]) + dwCompareFlags |= IFFCX_STYLE; + + if ((dwFlags & IEFF_EXTENDED) && plf->lfCharSet == DEFAULT_CHARSET) + dwCompareFlags |= IFFCX_CHARSET; + + // std::unique(first, last, IntFontFamilyCompareEx); + if (nCount == 0) + return 0; + + result = first = InfoList; + last = &InfoList[nCount]; + while (++first != last) + { + if (IntFontFamilyCompareEx(result, first, dwCompareFlags) != 0 && + ++result != first) + { + *result = *first; + } + } + nCount = (int)(++result - InfoList); + + return nCount; +} + static int FASTCALL IntEnumFontFamilies(HDC Dc, LPLOGFONTW LogFont, PVOID EnumProc, LPARAM lParam, - BOOL Unicode) + DWORD dwFlags) { int FontFamilyCount; int FontFamilySize; @@ -256,9 +335,15 @@ IntEnumFontFamilies(HDC Dc, LPLOGFONTW LogFont, PVOID EnumProc, LPARAM lParam, } } + DPRINT("qsort\n"); + qsort(Info, FontFamilyCount, sizeof(*Info), IntFontFamilyCompare); + DPRINT("qsort done\n"); + FontFamilyCount = IntFontFamilyListUnique(Info, FontFamilyCount, LogFont, dwFlags); + DPRINT("unique done\n"); + for (i = 0; i < FontFamilyCount; i++) { - if (Unicode) + if (dwFlags & IEFF_UNICODE) { Ret = ((FONTENUMPROCW) EnumProc)( (VOID*)&Info[i].EnumLogFontEx, @@ -299,7 +384,8 @@ int WINAPI EnumFontFamiliesExW(HDC hdc, LPLOGFONTW lpLogfont, FONTENUMPROCW lpEnumFontFamExProc, LPARAM lParam, DWORD dwFlags) { - return IntEnumFontFamilies(hdc, lpLogfont, lpEnumFontFamExProc, lParam, TRUE); + return IntEnumFontFamilies(hdc, lpLogfont, lpEnumFontFamExProc, lParam, + IEFF_UNICODE | IEFF_EXTENDED); } @@ -320,7 +406,7 @@ EnumFontFamiliesW(HDC hdc, LPCWSTR lpszFamily, FONTENUMPROCW lpEnumFontFamProc, lstrcpynW(LogFont.lfFaceName, lpszFamily, LF_FACESIZE); } - return IntEnumFontFamilies(hdc, &LogFont, lpEnumFontFamProc, lParam, TRUE); + return IntEnumFontFamilies(hdc, &LogFont, lpEnumFontFamProc, lParam, IEFF_UNICODE); } @@ -341,7 +427,7 @@ EnumFontFamiliesExA (HDC hdc, LPLOGFONTA lpLogfont, FONTENUMPROCA lpEnumFontFamE else pLogFontW = NULL; /* no need to convert LogFontW back to lpLogFont b/c it's an [in] parameter only */ - return IntEnumFontFamilies(hdc, pLogFontW, lpEnumFontFamExProc, lParam, FALSE); + return IntEnumFontFamilies(hdc, pLogFontW, lpEnumFontFamExProc, lParam, IEFF_EXTENDED); } @@ -362,7 +448,7 @@ EnumFontFamiliesA(HDC hdc, LPCSTR lpszFamily, FONTENUMPROCA lpEnumFontFamProc, MultiByteToWideChar(CP_THREAD_ACP, 0, lpszFamily, -1, LogFont.lfFaceName, LF_FACESIZE); } - return IntEnumFontFamilies(hdc, &LogFont, lpEnumFontFamProc, lParam, FALSE); + return IntEnumFontFamilies(hdc, &LogFont, lpEnumFontFamProc, lParam, 0); } diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index dc229a75d5..a74d223cd5 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -2251,73 +2251,6 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, return Cache->OutlineRequiredSize; } -static PFONTGDI FASTCALL -FindFaceNameInList(PUNICODE_STRING FaceName, PLIST_ENTRY Head) -{ - PLIST_ENTRY Entry; - PFONT_ENTRY CurrentEntry; - ANSI_STRING EntryFaceNameA; - UNICODE_STRING EntryFaceNameW; - FONTGDI *FontGDI; - NTSTATUS status; - - for (Entry = Head->Flink; Entry != Head; Entry = Entry->Flink) - { - CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry); - - FontGDI = CurrentEntry->Font; - ASSERT(FontGDI); - - RtlInitAnsiString(&EntryFaceNameA, FontGDI->SharedFace->Face->family_name); - status = RtlAnsiStringToUnicodeString(&EntryFaceNameW, &EntryFaceNameA, TRUE); - if (!NT_SUCCESS(status)) - { - break; - } - - if ((LF_FACESIZE - 1) * sizeof(WCHAR) < EntryFaceNameW.Length) - { - EntryFaceNameW.Length = (LF_FACESIZE - 1) * sizeof(WCHAR); - EntryFaceNameW.Buffer[LF_FACESIZE - 1] = L'\0'; - } - - if (RtlEqualUnicodeString(FaceName, &EntryFaceNameW, TRUE)) - { - RtlFreeUnicodeString(&EntryFaceNameW); - return FontGDI; - } - - RtlFreeUnicodeString(&EntryFaceNameW); - } - - return NULL; -} - -static PFONTGDI FASTCALL -FindFaceNameInLists(PUNICODE_STRING FaceName) -{ - PPROCESSINFO Win32Process; - PFONTGDI Font; - - /* Search the process local list. - We do not have to search the 'Mem' list, since those fonts are linked in the PrivateFontListHead */ - Win32Process = PsGetCurrentProcessWin32Process(); - IntLockProcessPrivateFonts(Win32Process); - Font = FindFaceNameInList(FaceName, &Win32Process->PrivateFontListHead); - IntUnLockProcessPrivateFonts(Win32Process); - if (NULL != Font) - { - return Font; - } - - /* Search the global list */ - IntLockGlobalFonts(); - Font = FindFaceNameInList(FaceName, &g_FontListHead); - IntUnLockGlobalFonts(); - - return Font; -} - /* See https://msdn.microsoft.com/en-us/library/bb165625(v=vs.90).aspx */ static BYTE CharSetFromLangID(LANGID LangID) @@ -2744,67 +2677,10 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, Info->NewTextMetricEx.ntmFontSig = fs; } -static int FASTCALL -FindFaceNameInInfo(PUNICODE_STRING FaceName, PFONTFAMILYINFO Info, DWORD InfoEntries) -{ - DWORD i; - UNICODE_STRING InfoFaceName; - - for (i = 0; i < InfoEntries; i++) - { - RtlInitUnicodeString(&InfoFaceName, Info[i].EnumLogFontEx.elfLogFont.lfFaceName); - if (RtlEqualUnicodeString(&InfoFaceName, FaceName, TRUE)) - { - return i; - } - } - - return -1; -} - -static BOOLEAN FASTCALL -FontFamilyInclude(LPLOGFONTW LogFont, PUNICODE_STRING FaceName, - PFONTFAMILYINFO Info, DWORD InfoEntries) -{ - UNICODE_STRING LogFontFaceName; - - RtlInitUnicodeString(&LogFontFaceName, LogFont->lfFaceName); - if (0 != LogFontFaceName.Length && - !RtlEqualUnicodeString(&LogFontFaceName, FaceName, TRUE)) - { - return FALSE; - } - - return FindFaceNameInInfo(FaceName, Info, InfoEntries) < 0; -} - -static BOOL FASTCALL -FontFamilyFound(PFONTFAMILYINFO InfoEntry, - PFONTFAMILYINFO Info, DWORD InfoCount) -{ - LPLOGFONTW plf1 = &InfoEntry->EnumLogFontEx.elfLogFont; - LPWSTR pFullName1 = InfoEntry->EnumLogFontEx.elfFullName; - LPWSTR pFullName2; - DWORD i; - - for (i = 0; i < InfoCount; ++i) - { - LPLOGFONTW plf2 = &Info[i].EnumLogFontEx.elfLogFont; - if (plf1->lfCharSet != plf2->lfCharSet) - continue; - - pFullName2 = Info[i].EnumLogFontEx.elfFullName; - if (_wcsicmp(pFullName1, pFullName2) != 0) - continue; - - return TRUE; - } - return FALSE; -} - static BOOLEAN FASTCALL GetFontFamilyInfoForList(LPLOGFONTW LogFont, PFONTFAMILYINFO Info, + LPCWSTR NominalName, DWORD *pCount, DWORD MaxCount, PLIST_ENTRY Head) @@ -2831,28 +2707,38 @@ GetFontFamilyInfoForList(LPLOGFONTW LogFont, { if (Count < MaxCount) { - FontFamilyFillInfo(&Info[Count], NULL, NULL, FontGDI); + FontFamilyFillInfo(&Info[Count], NominalName, NULL, FontGDI); } Count++; continue; } - FontFamilyFillInfo(&InfoEntry, NULL, NULL, FontGDI); + FontFamilyFillInfo(&InfoEntry, NominalName, NULL, FontGDI); - if (_wcsnicmp(LogFont->lfFaceName, InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, RTL_NUMBER_OF(LogFont->lfFaceName)-1) != 0 && - _wcsnicmp(LogFont->lfFaceName, InfoEntry.EnumLogFontEx.elfFullName, RTL_NUMBER_OF(LogFont->lfFaceName)-1) != 0) + if (NominalName) { - continue; + RtlStringCchCopyW(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, + RTL_NUMBER_OF(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName), + NominalName); } - - if (!FontFamilyFound(&InfoEntry, Info, min(Count, MaxCount))) + else { - if (Count < MaxCount) + if (_wcsnicmp(LogFont->lfFaceName, + InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, + RTL_NUMBER_OF(LogFont->lfFaceName) - 1) != 0 && + _wcsnicmp(LogFont->lfFaceName, + InfoEntry.EnumLogFontEx.elfFullName, + RTL_NUMBER_OF(LogFont->lfFaceName) - 1) != 0) { - RtlCopyMemory(&Info[Count], &InfoEntry, sizeof(InfoEntry)); + continue; } - Count++; } + + if (Count < MaxCount) + { + RtlCopyMemory(&Info[Count], &InfoEntry, sizeof(InfoEntry)); + } + Count++; } *pCount = Count; @@ -2868,10 +2754,9 @@ GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, { PLIST_ENTRY pEntry, pHead = &g_FontSubstListHead; PFONTSUBST_ENTRY pCurrentEntry; - PUNICODE_STRING pFromW; - FONTGDI *FontGDI; + PUNICODE_STRING pFromW, pToW; LOGFONTW lf = *LogFont; - UNICODE_STRING NameW; + PPROCESSINFO Win32Process = PsGetCurrentProcessWin32Process(); for (pEntry = pHead->Flink; pEntry != pHead; pEntry = pEntry->Flink) { @@ -2880,25 +2765,32 @@ GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, pFromW = &pCurrentEntry->FontNames[FONTSUBST_FROM]; if (LogFont->lfFaceName[0] != UNICODE_NULL) { - if (!FontFamilyInclude(LogFont, pFromW, Info, min(*pCount, MaxCount))) + if (_wcsicmp(LogFont->lfFaceName, pFromW->Buffer) != 0) continue; /* mismatch */ } + pToW = &pCurrentEntry->FontNames[FONTSUBST_TO]; + if (RtlEqualUnicodeString(pFromW, pToW, TRUE) && + pCurrentEntry->CharSets[FONTSUBST_FROM] == + pCurrentEntry->CharSets[FONTSUBST_TO]) + { + continue; + } + IntUnicodeStringToBuffer(lf.lfFaceName, sizeof(lf.lfFaceName), pFromW); SubstituteFontRecurse(&lf); + if (LogFont->lfCharSet != DEFAULT_CHARSET && LogFont->lfCharSet != lf.lfCharSet) + continue; - RtlInitUnicodeString(&NameW, lf.lfFaceName); - FontGDI = FindFaceNameInLists(&NameW); - if (FontGDI == NULL) - { - continue; /* no real font */ - } + IntLockGlobalFonts(); + GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount, &g_FontListHead); + IntUnLockGlobalFonts(); - if (*pCount < MaxCount) - { - FontFamilyFillInfo(&Info[*pCount], pFromW->Buffer, NULL, FontGDI); - } - (*pCount)++; + IntLockProcessPrivateFonts(Win32Process); + GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount, + &Win32Process->PrivateFontListHead); + IntUnLockProcessPrivateFonts(Win32Process); + break; } return TRUE; @@ -5541,7 +5433,7 @@ NtGdiGetFontFamilyInfo(HDC Dc, /* Enumerate font families in the global list */ IntLockGlobalFonts(); Count = 0; - if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, &g_FontListHead) ) + if (! GetFontFamilyInfoForList(&LogFont, Info, NULL, &Count, Size, &g_FontListHead) ) { IntUnLockGlobalFonts(); ExFreePoolWithTag(Info, GDITAG_TEXT); @@ -5552,7 +5444,7 @@ NtGdiGetFontFamilyInfo(HDC Dc, /* Enumerate font families in the process local list */ Win32Process = PsGetCurrentProcessWin32Process(); IntLockProcessPrivateFonts(Win32Process); - if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, + if (! GetFontFamilyInfoForList(&LogFont, Info, NULL, &Count, Size, &Win32Process->PrivateFontListHead)) { IntUnLockProcessPrivateFonts(Win32Process);

6 years

[reactos] 01/01: [GDI32_APITEST] Improve CreateFontIndirect testcase

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdaff94c3db31ba9c5910… commit cdaff94c3db31ba9c59104a79136f03adb6bef04 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 6 09:12:00 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Jan 6 09:20:30 2019 +0900 [GDI32_APITEST] Improve CreateFontIndirect testcase --- modules/rostests/apitests/gdi32/CreateFontIndirect.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/gdi32/CreateFontIndirect.c b/modules/rostests/apitests/gdi32/CreateFontIndirect.c index 4940957887..f284ac8eee 100644 --- a/modules/rostests/apitests/gdi32/CreateFontIndirect.c +++ b/modules/rostests/apitests/gdi32/CreateFontIndirect.c @@ -179,7 +179,11 @@ is_truetype_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, static BOOL is_truetype_font_installed(HDC hDC, const char *name) { - if (!EnumFontFamiliesA(hDC, name, is_truetype_font_proc, 0)) + LOGFONT lf; + ZeroMemory(&lf, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lstrcpy(lf.lfFaceName, name); + if (!EnumFontFamiliesExA(hDC, &lf, is_truetype_font_proc, 0, 0)) return TRUE; return FALSE; } @@ -195,7 +199,10 @@ is_charset_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, static BOOL is_charset_font_installed(HDC hDC, BYTE CharSet) { - if (!EnumFontFamiliesA(hDC, NULL, is_charset_font_proc, CharSet)) + LOGFONT lf; + ZeroMemory(&lf, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + if (!EnumFontFamiliesExA(hDC, &lf, is_charset_font_proc, CharSet, 0)) return TRUE; return FALSE; } @@ -215,7 +222,10 @@ is_fixed_charset_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, static BOOL is_fixed_charset_font_installed(HDC hDC, BYTE CharSet) { - if (!EnumFontFamiliesA(hDC, NULL, is_fixed_charset_font_proc, CharSet)) + LOGFONT lf; + ZeroMemory(&lf, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + if (!EnumFontFamiliesExA(hDC, &lf, is_fixed_charset_font_proc, CharSet, 0)) return TRUE; return FALSE; }

6 years

[reactos] 01/01: [FREELDR] Simplify code by using a AddReactOSArcDiskInfo() helper, and few extra additions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5053f1f5715b1a7ec9c36… commit 5053f1f5715b1a7ec9c36720f9b7ce1a5b87041c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 5 19:25:35 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 5 19:39:32 2019 +0100 [FREELDR] Simplify code by using a AddReactOSArcDiskInfo() helper, and few extra additions. - Introduce the AddReactOSArcDiskInfo() helper to get rid of the duplicated reactos_arc_disk_info usage scattered amongst different files. - GetHarddiskInformation(): If we cannot read the disk that has been enumerated by the BIOS, return a default identifier string. - GetHarddiskInformation(): The last character of the disk identifier string corresponds to whether its MBR is "valid"/has the 0xAA55 signature (use 'A') or whether it's not (use 'X'). Tested on Windows. - Split PcInitializeBootDevices() in two: the first part of this function that enumerates hard disks from the BIOS is now moved into EnumerateHarddisks(). - The 'ValidPartitionTable' field of the ARC disk signature records must be initialized with correct value that is specified in the different AddReactOSArcDiskInfo() calls. --- boot/freeldr/freeldr/arch/archwsup.c | 26 +++++++++++++ boot/freeldr/freeldr/arch/arm/macharm.c | 8 +--- boot/freeldr/freeldr/arch/i386/hwdisk.c | 56 ++++++++++++++++------------ boot/freeldr/freeldr/include/arch/archwsup.h | 7 ++++ boot/freeldr/freeldr/ntldr/winldr.c | 3 +- 5 files changed, 67 insertions(+), 33 deletions(-) diff --git a/boot/freeldr/freeldr/arch/archwsup.c b/boot/freeldr/freeldr/arch/archwsup.c index cad4226168..e4e44875b4 100644 --- a/boot/freeldr/freeldr/arch/archwsup.c +++ b/boot/freeldr/freeldr/arch/archwsup.c @@ -25,6 +25,32 @@ ARC_DISK_SIGNATURE_EX reactos_arc_disk_info[32]; #define TAG_HW_COMPONENT_DATA 'DCwH' #define TAG_HW_NAME 'mNwH' +VOID +AddReactOSArcDiskInfo( + IN PSTR ArcName, + IN ULONG Signature, + IN ULONG Checksum, + IN BOOLEAN ValidPartitionTable) +{ + ASSERT(reactos_disk_count < sizeof(reactos_arc_disk_info)/sizeof(reactos_arc_disk_info[0])); + + /* Fill out the ARC disk block */ + + reactos_arc_disk_info[reactos_disk_count].DiskSignature.Signature = Signature; + reactos_arc_disk_info[reactos_disk_count].DiskSignature.CheckSum = Checksum; + reactos_arc_disk_info[reactos_disk_count].DiskSignature.ValidPartitionTable = ValidPartitionTable; + + strcpy(reactos_arc_disk_info[reactos_disk_count].ArcName, ArcName); + reactos_arc_disk_info[reactos_disk_count].DiskSignature.ArcName = + reactos_arc_disk_info[reactos_disk_count].ArcName; + + reactos_disk_count++; +} + +// +// ARC Component Configuration Routines +// + VOID NTAPI FldrSetIdentifier(IN PCONFIGURATION_COMPONENT_DATA ComponentData, diff --git a/boot/freeldr/freeldr/arch/arm/macharm.c b/boot/freeldr/freeldr/arch/arm/macharm.c index 8bf927d1b9..8d4465f8d7 100644 --- a/boot/freeldr/freeldr/arch/arm/macharm.c +++ b/boot/freeldr/freeldr/arch/arm/macharm.c @@ -30,7 +30,6 @@ ULONG SecondLevelIcacheSize; ULONG SecondLevelIcacheFillSize; extern ULONG reactos_disk_count; -extern ARC_DISK_SIGNATURE_EX reactos_arc_disk_info[]; ULONG SizeBits[] = { @@ -142,12 +141,7 @@ ArmHwDetect(VOID) RamDiskInitialize(); /* Fill out the ARC disk block */ - reactos_arc_disk_info[reactos_disk_count].DiskSignature.Signature = 0xBADAB00F; - reactos_arc_disk_info[reactos_disk_count].DiskSignature.CheckSum = 0xDEADBABE; - strcpy(reactos_arc_disk_info[reactos_disk_count].ArcName, "ramdisk(0)"); - reactos_arc_disk_info[reactos_disk_count].DiskSignature.ArcName = - reactos_arc_disk_info[reactos_disk_count].ArcName; - reactos_disk_count++; + AddReactOSArcDiskInfo("ramdisk(0)", 0xBADAB00F, 0xDEADBABE, TRUE); ASSERT(reactos_disk_count == 1); /* Return the root node */ diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index af86f62382..6123fc1d13 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -38,9 +38,6 @@ typedef struct tagDISKCONTEXT ULONGLONG SectorNumber; } DISKCONTEXT; -extern ULONG reactos_disk_count; -extern ARC_DISK_SIGNATURE_EX reactos_arc_disk_info[]; - static CHAR Hex[] = "0123456789abcdef"; /* Data cache for BIOS disks pre-enumeration */ @@ -216,6 +213,7 @@ GetHarddiskInformation(UCHAR DriveNumber) ULONG i; ULONG Checksum; ULONG Signature; + BOOLEAN ValidPartitionTable; CHAR ArcName[MAX_PATH]; PARTITION_TABLE_ENTRY PartitionTableEntry; PCHAR Identifier = PcDiskIdentifier[DriveNumber - 0x80]; @@ -224,6 +222,8 @@ GetHarddiskInformation(UCHAR DriveNumber) if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, DiskReadBuffer)) { ERR("Reading MBR failed\n"); + /* We failed, use a default identifier */ + sprintf(Identifier, "BIOSDISK%d", DriveNumber - 0x80 + 1); return; } @@ -242,14 +242,11 @@ GetHarddiskInformation(UCHAR DriveNumber) Checksum = ~Checksum + 1; TRACE("Checksum: %x\n", Checksum); + ValidPartitionTable = (Mbr->MasterBootRecordMagic == 0xAA55); + /* Fill out the ARC disk block */ - reactos_arc_disk_info[reactos_disk_count].DiskSignature.Signature = Signature; - reactos_arc_disk_info[reactos_disk_count].DiskSignature.CheckSum = Checksum; - sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)", reactos_disk_count); - strcpy(reactos_arc_disk_info[reactos_disk_count].ArcName, ArcName); - reactos_arc_disk_info[reactos_disk_count].DiskSignature.ArcName = - reactos_arc_disk_info[reactos_disk_count].ArcName; - reactos_disk_count++; + sprintf(ArcName, "multi(0)disk(0)rdisk(%u)", DriveNumber - 0x80); + AddReactOSArcDiskInfo(ArcName, Signature, Checksum, ValidPartitionTable); sprintf(ArcName, "multi(0)disk(0)rdisk(%u)partition(0)", DriveNumber - 0x80); FsRegisterDevice(ArcName, &DiskVtbl); @@ -287,21 +284,21 @@ GetHarddiskInformation(UCHAR DriveNumber) Identifier[15] = Hex[(Signature >> 4) & 0x0F]; Identifier[16] = Hex[Signature & 0x0F]; Identifier[17] = '-'; - Identifier[18] = 'A'; // FIXME: Not always 'A' ... + Identifier[18] = (ValidPartitionTable ? 'A' : 'X'); Identifier[19] = 0; TRACE("Identifier: %s\n", Identifier); } -BOOLEAN -PcInitializeBootDevices(VOID) +static UCHAR +EnumerateHarddisks(OUT PBOOLEAN BootDriveReported) { UCHAR DiskCount, DriveNumber; ULONG i; BOOLEAN Changed; - BOOLEAN BootDriveReported = FALSE; - CHAR BootPath[MAX_PATH]; - /* Count the number of visible drives */ + *BootDriveReported = FALSE; + + /* Count the number of visible harddisk drives */ DiskReportError(FALSE); DiskCount = 0; DriveNumber = 0x80; @@ -333,7 +330,7 @@ PcInitializeBootDevices(VOID) /* Check if we have seen the boot drive */ if (FrldrBootDrive == DriveNumber) - BootDriveReported = TRUE; + *BootDriveReported = TRUE; DiskCount++; DriveNumber++; @@ -345,6 +342,19 @@ PcInitializeBootDevices(VOID) TRACE("BIOS reports %d harddisk%s\n", (int)DiskCount, (DiskCount == 1) ? "" : "s"); + return DiskCount; +} + +BOOLEAN +PcInitializeBootDevices(VOID) +{ + UCHAR DiskCount; + BOOLEAN BootDriveReported = FALSE; + ULONG i; + CHAR BootPath[MAX_PATH]; + + DiskCount = EnumerateHarddisks(&BootDriveReported); + /* Get the drive we're booting from */ MachDiskGetBootPath(BootPath, sizeof(BootPath)); @@ -373,17 +383,15 @@ PcInitializeBootDevices(VOID) TRACE("Signature: %x\n", Signature); /* Calculate the MBR checksum */ - for (i = 0; i < 2048 / sizeof(ULONG); i++) Checksum += Buffer[i]; + for (i = 0; i < 2048 / sizeof(ULONG); i++) + { + Checksum += Buffer[i]; + } Checksum = ~Checksum + 1; TRACE("Checksum: %x\n", Checksum); /* Fill out the ARC disk block */ - reactos_arc_disk_info[reactos_disk_count].DiskSignature.Signature = Signature; - reactos_arc_disk_info[reactos_disk_count].DiskSignature.CheckSum = Checksum; - strcpy(reactos_arc_disk_info[reactos_disk_count].ArcName, BootPath); - reactos_arc_disk_info[reactos_disk_count].DiskSignature.ArcName = - reactos_arc_disk_info[reactos_disk_count].ArcName; - reactos_disk_count++; + AddReactOSArcDiskInfo(BootPath, Signature, Checksum, TRUE); FsRegisterDevice(BootPath, &DiskVtbl); DiskCount++; // This is not accounted for in the number of pre-enumerated BIOS drives! diff --git a/boot/freeldr/freeldr/include/arch/archwsup.h b/boot/freeldr/freeldr/include/arch/archwsup.h index 2fe5edc1a8..bbf50dcbfe 100644 --- a/boot/freeldr/freeldr/include/arch/archwsup.h +++ b/boot/freeldr/freeldr/include/arch/archwsup.h @@ -22,6 +22,13 @@ /* PROTOTYPES ***************************************************************/ +VOID +AddReactOSArcDiskInfo( + IN PSTR ArcName, + IN ULONG Signature, + IN ULONG Checksum, + IN BOOLEAN ValidPartitionTable); + // // ARC Component Configuration Routines // diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index e776a84024..e01c5174ca 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -151,9 +151,8 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, /* Copy the data over */ RtlCopyMemory(ArcDiskSig, &reactos_arc_disk_info[i], sizeof(ARC_DISK_SIGNATURE_EX)); - /* Set the ARC Name pointer and mark the partition table as valid */ + /* Set the ARC Name pointer */ ArcDiskSig->DiskSignature.ArcName = PaToVa(ArcDiskSig->ArcName); - ArcDiskSig->DiskSignature.ValidPartitionTable = TRUE; /* Insert into the list */ InsertTailList(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead,

6 years

[reactos] 01/01: [KERNEL32] make some NLS and Format functions work. Wine-sync with latest version

by Denis Malikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=655d24d9eb530bcc12935… commit 655d24d9eb530bcc12935bc8fa025025c78a23eb Author: Denis Malikov <filedem(a)gmail.com> AuthorDate: Sun Nov 18 21:32:13 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 5 19:01:30 2019 +0100 [KERNEL32] make some NLS and Format functions work. Wine-sync with latest version --- base/shell/cmd/config.h | 2 +- dll/win32/kernel32/include/kernel32.h | 2 + dll/win32/kernel32/kernel32.spec | 25 +- dll/win32/kernel32/winnls/string/lang.c | 375 +++++++++++++++++++++++++++- dll/win32/kernel32/winnls/string/lcformat.c | 110 +++++--- dll/win32/kernel32/winnls/string/nls.c | 13 + media/doc/README.WINE | 2 +- sdk/include/psdk/winnls.h | 29 +++ 8 files changed, 504 insertions(+), 54 deletions(-) diff --git a/base/shell/cmd/config.h b/base/shell/cmd/config.h index e89e1eab63..bdeeaa0e04 100644 --- a/base/shell/cmd/config.h +++ b/base/shell/cmd/config.h @@ -42,7 +42,7 @@ /* Define one of these to select the used locale. */ /* (date and time formats etc.) used in DATE, TIME, */ /* DIR, PROMPT etc. */ -#define LOCALE_WINDOWS /* System locale */ +/* #define LOCALE_WINDOWS */ /* System locale */ /* #define LOCALE_GERMAN */ /* German locale */ /* #define LOCALE_DEFAULT */ /* United States locale */ diff --git a/dll/win32/kernel32/include/kernel32.h b/dll/win32/kernel32/include/kernel32.h index d5839bfc8d..005b5d0527 100644 --- a/dll/win32/kernel32/include/kernel32.h +++ b/dll/win32/kernel32/include/kernel32.h @@ -50,6 +50,8 @@ #define ROUND_UP(n, align) \ ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) + #define __TRY _SEH2_TRY #define __EXCEPT_PAGE_FAULT _SEH2_EXCEPT(_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) #define __ENDTRY _SEH2_END diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index aea5d2f280..f3ee418b65 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -225,12 +225,12 @@ @ stdcall EnterCriticalSection(ptr) ntdll.RtlEnterCriticalSection @ stdcall EnumCalendarInfoA(ptr long long long) @ stdcall EnumCalendarInfoExA(ptr long long long) -@ stub -version=0x600+ EnumCalendarInfoExEx +@ stdcall -version=0x600+ EnumCalendarInfoExEx(ptr wstr long wstr long long) @ stdcall EnumCalendarInfoExW(ptr long long long) @ stdcall EnumCalendarInfoW(ptr long long long) @ stdcall EnumDateFormatsA(ptr long long) @ stdcall EnumDateFormatsExA(ptr long long) -@ stub -version=0x600+ EnumDateFormatsExEx +@ stdcall -version=0x600+ EnumDateFormatsExEx(ptr wstr long long) @ stdcall EnumDateFormatsExW(ptr long long) @ stdcall EnumDateFormatsW(ptr long long) @ stdcall EnumLanguageGroupLocalesA(ptr long long ptr) @@ -254,10 +254,10 @@ @ stdcall EnumSystemLanguageGroupsA(ptr long ptr) @ stdcall EnumSystemLanguageGroupsW(ptr long ptr) @ stdcall EnumSystemLocalesA(ptr long) -@ stub -version=0x600+ EnumSystemLocalesEx +@ stdcall -version=0x600+ EnumSystemLocalesEx(ptr long long ptr) @ stdcall EnumSystemLocalesW(ptr long) @ stdcall EnumTimeFormatsA(ptr long long) -@ stub -version=0x600+ EnumTimeFormatsEx +@ stdcall -version=0x600+ EnumTimeFormatsEx(ptr wstr long long) @ stdcall EnumTimeFormatsW(ptr long long) @ stdcall EnumUILanguagesA(ptr long long) @ stdcall EnumUILanguagesW(ptr long long) @@ -360,7 +360,7 @@ @ stub -version=0x600+ GetCalendarDaysInMonth @ stub -version=0x600+ GetCalendarDifferenceInDays @ stdcall GetCalendarInfoA(long long long ptr long ptr) -@ stub -version=0x600+ GetCalendarInfoEx +@ stdcall -version=0x600+ GetCalendarInfoEx(wstr, long, wstr, long, wstr, long, ptr) @ stdcall GetCalendarInfoW(long long long ptr long ptr) @ stub -version=0x600+ GetCalendarMonthsInYear @ stub -version=0x600+ GetCalendarSupportedDateRange @@ -436,7 +436,7 @@ @ stdcall -norelay GetCurrentThread() @ stdcall -norelay GetCurrentThreadId() @ stdcall GetDateFormatA(long long ptr str ptr long) -@ stub -version=0x600+ GetDateFormatEx +@ stdcall -version=0x600+ GetDateFormatEx(wstr long ptr wstr wstr long wstr) @ stdcall GetDateFormatW(long long ptr wstr ptr long) @ stdcall GetDefaultCommConfigA(str ptr long) @ stdcall GetDefaultCommConfigW(wstr ptr long) @@ -496,8 +496,9 @@ @ stdcall -version=0x500-0x502 GetLinguistLangSize(ptr) @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) -@ stub -version=0x600+ GetLocaleInfoEx +@ stdcall -version=0x600+ GetLocaleInfoEx(wstr long ptr long) @ stdcall GetLocaleInfoW(long long ptr long) +@ stdcall -version=0x600+ IsValidLocaleName(wstr) @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @ stdcall GetLogicalDrives() @@ -514,7 +515,7 @@ @ stdcall GetModuleHandleExW(long ptr ptr) @ stdcall GetModuleHandleW(wstr) @ stdcall GetNLSVersion(long long ptr) -@ stub -version=0x600+ GetNLSVersionEx +@ stdcall GetNLSVersionEx(long wstr ptr) @ stub -version=0x600+ GetNamedPipeAttribute @ stub -version=0x600+ GetNamedPipeClientComputerNameA @ stub -version=0x600+ GetNamedPipeClientComputerNameW @@ -534,7 +535,7 @@ @ stdcall GetNumaProcessorNode(long ptr) @ stub -version=0x600+ GetNumaProximityNode @ stdcall GetNumberFormatA(long long str ptr ptr long) -@ stub -version=0x600+ GetNumberFormatEx +@ stdcall -version=0x600+ GetNumberFormatEx(wstr long wstr ptr wstr long) @ stdcall GetNumberFormatW(long long wstr ptr ptr long) @ stdcall GetNumberOfConsoleFonts() @ stdcall GetNumberOfConsoleInputEvents(long ptr) @@ -628,14 +629,14 @@ @ stdcall GetTickCount() @ stub -version=0x600+ GetTickCount64 @ stdcall GetTimeFormatA(long long ptr str ptr long) -@ stub -version=0x600+ GetTimeFormatEx +@ stdcall -version=0x600+ GetTimeFormatEx(wstr long ptr wstr wstr long) @ stdcall GetTimeFormatW(long long ptr wstr ptr long) @ stdcall GetTimeZoneInformation(ptr) @ stub -version=0x600+ GetTimeZoneInformationForYear @ stub -version=0x600+ GetUILanguageInfo @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() -@ stub -version=0x600+ GetUserDefaultLocaleName +@ stdcall -version=0x600+ GetUserDefaultLocaleName(wstr long) @ stdcall GetUserDefaultUILanguage() @ stdcall GetUserGeoID(long) @ stub -version=0x600+ GetUserPreferredUILanguages @@ -754,7 +755,7 @@ @ stdcall IsWow64Process(ptr ptr) @ stub -version=0x600+ LCIDToLocaleName @ stdcall LCMapStringA(long long str long ptr long) -@ stub -version=0x600+ LCMapStringEx +@ stdcall -version=0x600+ LCMapStringEx(long long wstr long ptr long ptr ptr long) @ stdcall LCMapStringW(long long wstr long ptr long) @ stdcall LZClose(long) @ stdcall LZCloseFile(long) diff --git a/dll/win32/kernel32/winnls/string/lang.c b/dll/win32/kernel32/winnls/string/lang.c index 5bd9ec47b2..42c57d1aef 100644 --- a/dll/win32/kernel32/winnls/string/lang.c +++ b/dll/win32/kernel32/winnls/string/lang.c @@ -56,7 +56,7 @@ static const WCHAR szLangGroupsKeyName[] = { 'L','a','n','g','u','a','g','e',' ','G','r','o','u','p','s',0 }; -#ifndef __REACTOS__ +#if (WINVER >= 0x0600) /* Charset to codepage map, sorted by name. */ static const struct charset_entry { @@ -262,6 +262,248 @@ static inline UINT get_lcid_codepage( LCID lcid ) return ret; } +#if (WINVER >= 0x0600) +/*********************************************************************** + * charset_cmp (internal) + */ +static int charset_cmp( const void *name, const void *entry ) +{ + const struct charset_entry *charset = entry; + return strcasecmp( name, charset->charset_name ); +} + +/*********************************************************************** + * find_charset + */ +static UINT find_charset( const WCHAR *name ) +{ + const struct charset_entry *entry; + char charset_name[16]; + size_t i, j; + + /* remove punctuation characters from charset name */ + for (i = j = 0; name[i] && j < sizeof(charset_name)-1; i++) + if (isalnum((unsigned char)name[i])) charset_name[j++] = name[i]; + charset_name[j] = 0; + + entry = bsearch( charset_name, charset_names, ARRAY_SIZE( charset_names ), + sizeof(charset_names[0]), charset_cmp ); + if (entry) return entry->codepage; + return 0; +} + +static LANGID get_default_sublang( LANGID lang ) +{ + switch (lang) + { + case MAKELANGID( LANG_SPANISH, SUBLANG_NEUTRAL ): + return MAKELANGID( LANG_SPANISH, SUBLANG_SPANISH_MODERN ); + case MAKELANGID( LANG_CHINESE, SUBLANG_NEUTRAL ): + return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED ); + case MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE ): + return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED ); + case MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL ): + case MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_MACAU ): + return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ); + } + if (SUBLANGID( lang ) == SUBLANG_NEUTRAL) lang = MAKELANGID( PRIMARYLANGID(lang), SUBLANG_DEFAULT ); + return lang; +} + +/*********************************************************************** + * find_locale_id_callback + */ +static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, + LPCWSTR name, LANGID lang, LPARAM lParam ) +{ + struct locale_name *data = (struct locale_name *)lParam; + WCHAR buffer[128]; + int matches = 0; + LCID lcid = MAKELCID( lang, SORT_DEFAULT ); /* FIXME: handle sort order */ + + if (PRIMARYLANGID(lang) == LANG_NEUTRAL) return TRUE; /* continue search */ + + /* first check exact name */ + if (data->win_name[0] && + GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, buffer, ARRAY_SIZE( buffer ))) + { + if (!strcmpiW( data->win_name, buffer )) + { + matches = 4; /* everything matches */ + goto done; + } + } + + if (!GetLocaleInfoW( lcid, LOCALE_SISO639LANGNAME | LOCALE_NOUSEROVERRIDE, + buffer, ARRAY_SIZE( buffer ))) + return TRUE; + if (strcmpiW( buffer, data->lang )) return TRUE; + matches++; /* language name matched */ + + if (data->script) + { + if (GetLocaleInfoW( lcid, LOCALE_SSCRIPTS | LOCALE_NOUSEROVERRIDE, + buffer, ARRAY_SIZE( buffer ))) + { + const WCHAR *p = buffer; + unsigned int len = strlenW( data->script ); + while (*p) + { + if (!strncmpiW( p, data->script, len ) && (!p[len] || p[len] == ';')) break; + if (!(p = strchrW( p, ';'))) goto done; + p++; + } + if (!*p) goto done; + matches++; /* script matched */ + } + } + + if (data->country) + { + if (GetLocaleInfoW( lcid, LOCALE_SISO3166CTRYNAME|LOCALE_NOUSEROVERRIDE, + buffer, ARRAY_SIZE( buffer ))) + { + if (strcmpiW( buffer, data->country )) goto done; + matches++; /* country name matched */ + } + } + else /* match default language */ + { + LANGID def_lang = data->script ? lang : MAKELANGID( PRIMARYLANGID(lang), LANG_NEUTRAL ); + if (lang == get_default_sublang( def_lang )) matches++; + } + + if (data->codepage) + { + UINT unix_cp; + if (GetLocaleInfoW( lcid, LOCALE_IDEFAULTUNIXCODEPAGE | LOCALE_RETURN_NUMBER, + (LPWSTR)&unix_cp, sizeof(unix_cp)/sizeof(WCHAR) )) + { + if (unix_cp == data->codepage) matches++; + } + } + + /* FIXME: check sort order */ + +done: + if (matches > data->matches) + { + data->lcid = lcid; + data->matches = matches; + } + return (data->matches < 4); /* no need to continue for perfect match */ +} + + +/*********************************************************************** + * parse_locale_name + * + * Parse a locale name into a struct locale_name, handling both Windows and Unix formats. + * Unix format is: lang[_country][.charset][@modifier] + * Windows format is: lang[-script][-country][_modifier] + */ +static void parse_locale_name( const WCHAR *str, struct locale_name *name ) +{ + static const WCHAR sepW[] = {'-','_','.','@',0}; + static const WCHAR winsepW[] = {'-','_',0}; + static const WCHAR posixW[] = {'P','O','S','I','X',0}; + static const WCHAR cW[] = {'C',0}; + static const WCHAR latinW[] = {'l','a','t','i','n',0}; + static const WCHAR latnW[] = {'-','L','a','t','n',0}; + WCHAR *p; + + TRACE("%s\n", debugstr_w(str)); + + name->country = name->charset = name->script = name->modifier = NULL; + name->lcid = MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); + name->matches = 0; + name->codepage = 0; + name->win_name[0] = 0; + lstrcpynW( name->lang, str, ARRAY_SIZE( name->lang )); + + if (!*name->lang) + { + name->lcid = LOCALE_INVARIANT; + name->matches = 4; + return; + } + + if (!(p = strpbrkW( name->lang, sepW ))) + { + if (!strcmpW( name->lang, posixW ) || !strcmpW( name->lang, cW )) + { + name->matches = 4; /* perfect match for default English lcid */ + return; + } + strcpyW( name->win_name, name->lang ); + } + else if (*p == '-') /* Windows format */ + { + strcpyW( name->win_name, name->lang ); + *p++ = 0; + name->country = p; + if ((p = strpbrkW( p, winsepW )) && *p == '-') + { + *p++ = 0; + name->script = name->country; + name->country = p; + p = strpbrkW( p, winsepW ); + } + if (p) + { + *p++ = 0; + name->modifier = p; + } + /* second value can be script or country, check length to resolve the ambiguity */ + if (!name->script && strlenW( name->country ) == 4) + { + name->script = name->country; + name->country = NULL; + } + } + else /* Unix format */ + { + if (*p == '_') + { + *p++ = 0; + name->country = p; + p = strpbrkW( p, sepW + 2 ); + } + if (p && *p == '.') + { + *p++ = 0; + name->charset = p; + p = strchrW( p, '@' ); + } + if (p) + { + *p++ = 0; + name->modifier = p; + } + + if (name->charset) + name->codepage = find_charset( name->charset ); + + /* rebuild a Windows name if possible */ + + if (name->charset) goto done; /* can't specify charset in Windows format */ + if (name->modifier && strcmpW( name->modifier, latinW )) + goto done; /* only Latn script supported for now */ + strcpyW( name->win_name, name->lang ); + if (name->modifier) strcatW( name->win_name, latnW ); + if (name->country) + { + p = name->win_name + strlenW(name->win_name); + *p++ = '-'; + strcpyW( p, name->country ); + } + } +done: + EnumResourceLanguagesW( kernel32_handle, (LPCWSTR)RT_STRING, (LPCWSTR)LOCALE_ILANGUAGE, + find_locale_id_callback, (LPARAM)name ); +} +#endif + /*********************************************************************** * convert_default_lcid * @@ -585,6 +827,52 @@ LANGID WINAPI GetSystemDefaultUILanguage(void) return lang; } +#if (WINVER >= 0x0600) +/*********************************************************************** + * LocaleNameToLCID (KERNEL32.@) + */ +LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) +{ + struct locale_name locale_name; + static int once; + + if (flags && !once++) + FIXME( "unsupported flags %x\n", flags ); + + if (name == LOCALE_NAME_USER_DEFAULT) + return GetUserDefaultLCID(); + + /* string parsing */ + parse_locale_name( name, &locale_name ); + + TRACE( "found lcid %x for %s, matches %d\n", + locale_name.lcid, debugstr_w(name), locale_name.matches ); + + if (!locale_name.matches) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (locale_name.matches == 1) + WARN( "locale %s not recognized, defaulting to %s\n", + debugstr_w(name), debugstr_w(locale_name.lang) ); + + return locale_name.lcid; +} + + +/*********************************************************************** + * LCIDToLocaleName (KERNEL32.@) + */ +INT WINAPI LCIDToLocaleName( LCID lcid, LPWSTR name, INT count, DWORD flags ) +{ + static int once; + if (flags && !once++) FIXME( "unsupported flags %x\n", flags ); + + return GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, name, count ); +} +#endif /****************************************************************************** * get_registry_locale_info @@ -965,6 +1253,41 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) return ret; } +#if (WINVER >= 0x0600) +WINBASEAPI +int +WINAPI +GetLocaleInfoEx( + _In_opt_ LPCWSTR lpLocaleName, + _In_ LCTYPE LCType, + _Out_writes_opt_(cchData) LPWSTR lpLCData, + _In_ int cchData) +{ + TRACE( "GetLocaleInfoEx not implemented (lcid=%s,lctype=0x%x,%s,%d)\n", debugstr_w(lpLocaleName), LCType, debugstr_w(lpLCData), cchData ); + return 0; +} + +BOOL +WINAPI +IsValidLocaleName( + LPCWSTR lpLocaleName +) +{ + TRACE( "IsValidLocaleName not implemented (lpLocaleName=%s)\n", debugstr_w(lpLocaleName)); + return TRUE; +} + +INT +WINAPI +GetUserDefaultLocaleName( + LPWSTR lpLocaleName, + INT cchLocaleName +) +{ + TRACE( "GetUserDefaultLocaleName not implemented (lpLocaleName=%s, cchLocaleName=%d)\n", debugstr_w(lpLocaleName), cchLocaleName); + return 0; +} +#endif /****************************************************************************** * SetLocaleInfoA [KERNEL32.@] @@ -1284,6 +1607,56 @@ BOOL WINAPI EnumSystemLocalesW( LOCALE_ENUMPROCW lpfnLocaleEnum, DWORD dwFlags ) return TRUE; } + +struct enum_locale_ex_data +{ + LOCALE_ENUMPROCEX proc; + DWORD flags; + LPARAM lparam; +}; + +static BOOL CALLBACK enum_locale_ex_proc( HMODULE module, LPCWSTR type, + LPCWSTR name, WORD lang, LONG_PTR lparam ) +{ + struct enum_locale_ex_data *data = (struct enum_locale_ex_data *)lparam; + WCHAR buffer[256]; + DWORD neutral; + unsigned int flags; + + GetLocaleInfoW( MAKELCID( lang, SORT_DEFAULT ), LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, + buffer, ARRAY_SIZE( buffer )); + if (!GetLocaleInfoW( MAKELCID( lang, SORT_DEFAULT ), + LOCALE_INEUTRAL | LOCALE_NOUSEROVERRIDE | LOCALE_RETURN_NUMBER, + (LPWSTR)&neutral, sizeof(neutral) / sizeof(WCHAR) )) + neutral = 0; + flags = LOCALE_WINDOWS; + flags |= neutral ? LOCALE_NEUTRALDATA : LOCALE_SPECIFICDATA; + if (data->flags && !(data->flags & flags)) return TRUE; + return data->proc( buffer, flags, data->lparam ); +} + +/****************************************************************************** + * EnumSystemLocalesEx (KERNEL32.@) + */ +BOOL WINAPI EnumSystemLocalesEx( LOCALE_ENUMPROCEX proc, DWORD flags, LPARAM lparam, LPVOID reserved ) +{ + struct enum_locale_ex_data data; + + if (reserved) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + data.proc = proc; + data.flags = flags; + data.lparam = lparam; + EnumResourceLanguagesW( kernel32_handle, (LPCWSTR)RT_STRING, + (LPCWSTR)MAKEINTRESOURCE((LOCALE_SNAME >> 4) + 1), + enum_locale_ex_proc, (LONG_PTR)&data ); + return TRUE; +} + + /*********************************************************************** * VerLanguageNameA (KERNEL32.@) * diff --git a/dll/win32/kernel32/winnls/string/lcformat.c b/dll/win32/kernel32/winnls/string/lcformat.c index 7f57373e2d..a4088cb9b2 100644 --- a/dll/win32/kernel32/winnls/string/lcformat.c +++ b/dll/win32/kernel32/winnls/string/lcformat.c @@ -124,7 +124,7 @@ static DWORD NLS_GetLocaleNumber(LCID lcid, DWORD dwFlags) DWORD dwVal = 0; szBuff[0] = '\0'; - GetLocaleInfoW(lcid, dwFlags, szBuff, sizeof(szBuff) / sizeof(WCHAR)); + GetLocaleInfoW(lcid, dwFlags, szBuff, ARRAY_SIZE(szBuff)); if (szBuff[0] && szBuff[1] == ';' && szBuff[2] != '0') dwVal = (szBuff[0] - '0') * 10 + (szBuff[2] - '0'); @@ -149,7 +149,7 @@ static WCHAR* NLS_GetLocaleString(LCID lcid, DWORD dwFlags) DWORD dwLen; szBuff[0] = '\0'; - GetLocaleInfoW(lcid, dwFlags, szBuff, sizeof(szBuff) / sizeof(WCHAR)); + GetLocaleInfoW(lcid, dwFlags, szBuff, ARRAY_SIZE(szBuff)); dwLen = strlenW(szBuff) + 1; str = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); if (str) @@ -278,7 +278,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags) GET_LOCALE_STRING(new_node->cyfmt.lpCurrencySymbol, LOCALE_SCURRENCY); /* Date/Time Format info, negative character, etc */ - for (i = 0; i < sizeof(NLS_LocaleIndices)/sizeof(NLS_LocaleIndices[0]); i++) + for (i = 0; i < ARRAY_SIZE(NLS_LocaleIndices); i++) { GET_LOCALE_STRING(new_node->lppszStrings[i], NLS_LocaleIndices[i]); } @@ -322,7 +322,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags) /* We raced and lost: The node was already added by another thread. * node points to the currently cached node, so free new_node. */ - for (i = 0; i < sizeof(NLS_LocaleIndices)/sizeof(NLS_LocaleIndices[0]); i++) + for (i = 0; i < ARRAY_SIZE(NLS_LocaleIndices); i++) HeapFree(GetProcessHeap(), 0, new_node->lppszStrings[i]); HeapFree(GetProcessHeap(), 0, new_node->fmt.lpDecimalSep); HeapFree(GetProcessHeap(), 0, new_node->fmt.lpThousandSep); @@ -697,7 +697,7 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, { static const WCHAR fmtW[] = {'%','.','*','d',0}; /* We have a numeric value to add */ - snprintfW(buff, sizeof(buff)/sizeof(WCHAR), fmtW, count, dwVal); + snprintfW(buff, ARRAY_SIZE(buff), fmtW, count, dwVal); } dwLen = szAdd ? strlenW(szAdd) : 0; @@ -793,10 +793,10 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags, } if (lpFormat) - MultiByteToWideChar(cp, 0, lpFormat, -1, szFormat, sizeof(szFormat)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat, -1, szFormat, ARRAY_SIZE(szFormat)); - if (cchOut > (int)(sizeof(szOut)/sizeof(WCHAR))) - cchOut = sizeof(szOut)/sizeof(WCHAR); + if (cchOut > (int) ARRAY_SIZE(szOut)) + cchOut = ARRAY_SIZE(szOut); szOut[0] = '\0'; @@ -866,7 +866,7 @@ INT WINAPI GetDateFormatA( LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, lpFormat, lpDateStr, cchOut); } -#ifndef __REACTOS__ +#if _WIN32_WINNT >= 0x600 /****************************************************************************** * GetDateFormatEx [KERNEL32.@] * @@ -906,7 +906,7 @@ INT WINAPI GetDateFormatEx(LPCWSTR localename, DWORD flags, flags | DATE_DATEVARSONLY, date, format, outbuf, bufsize); } -#endif /* !__REACTOS__ */ +#endif /* _WIN32_WINNT >= 0x600 */ /****************************************************************************** * GetDateFormatW [KERNEL32.@] @@ -974,7 +974,7 @@ INT WINAPI GetTimeFormatA(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, lpFormat, lpTimeStr, cchOut); } -#ifndef __REACTOS__ +#if _WIN32_WINNT >= 0x600 /****************************************************************************** * GetTimeFormatEx [KERNEL32.@] * @@ -1006,7 +1006,7 @@ INT WINAPI GetTimeFormatEx(LPCWSTR localename, DWORD flags, flags | TIME_TIMEVARSONLY, time, format, outbuf, bufsize); } -#endif /* !__REACTOS__ */ +#endif /* _WIN32_WINNT >= 0x600 */ /****************************************************************************** * GetTimeFormatW [KERNEL32.@] @@ -1087,21 +1087,21 @@ INT WINAPI GetNumberFormatA(LCID lcid, DWORD dwFlags, pfmt = &fmt; if (lpFormat->lpDecimalSep) { - MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, sizeof(szDec)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, ARRAY_SIZE(szDec)); fmt.lpDecimalSep = szDec; } if (lpFormat->lpThousandSep) { - MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, sizeof(szGrp)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, ARRAY_SIZE(szGrp)); fmt.lpThousandSep = szGrp; } } if (lpszValue) - MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, sizeof(szIn)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, ARRAY_SIZE(szIn)); - if (cchOut > (int)(sizeof(szOut)/sizeof(WCHAR))) - cchOut = sizeof(szOut)/sizeof(WCHAR); + if (cchOut > (int) ARRAY_SIZE(szOut)) + cchOut = ARRAY_SIZE(szOut); szOut[0] = '\0'; @@ -1136,7 +1136,7 @@ INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags, LPCWSTR lpszValue, const NUMBERFMTW *lpFormat, LPWSTR lpNumberStr, int cchOut) { - WCHAR szBuff[128], *szOut = szBuff + sizeof(szBuff) / sizeof(WCHAR) - 1; + WCHAR szBuff[128], *szOut = szBuff + ARRAY_SIZE(szBuff) - 1; WCHAR szNegBuff[8]; const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc; DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0; @@ -1164,7 +1164,7 @@ INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags, else { GetLocaleInfoW(lcid, LOCALE_SNEGATIVESIGN|(dwFlags & LOCALE_NOUSEROVERRIDE), - szNegBuff, sizeof(szNegBuff)/sizeof(WCHAR)); + szNegBuff, ARRAY_SIZE(szNegBuff)); lpszNegStart = lpszNeg = szNegBuff; } lpszNeg = lpszNeg + strlenW(lpszNeg) - 1; @@ -1368,7 +1368,7 @@ error: return 0; } -#ifndef __REACTOS__ +#if _WIN32_WINNT >= 0x600 /************************************************************************** * GetNumberFormatEx (KERNEL32.@) */ @@ -1387,7 +1387,7 @@ INT WINAPI GetNumberFormatEx(LPCWSTR name, DWORD flags, return GetNumberFormatW(lcid, flags, value, format, number, numout); } -#endif /* !__REACTOS__ */ +#endif /* _WIN32_WINNT >= 0x600 */ /************************************************************************** * GetCurrencyFormatA (KERNEL32.@) @@ -1453,26 +1453,26 @@ INT WINAPI GetCurrencyFormatA(LCID lcid, DWORD dwFlags, pfmt = &fmt; if (lpFormat->lpDecimalSep) { - MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, sizeof(szDec)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, ARRAY_SIZE(szDec)); fmt.lpDecimalSep = szDec; } if (lpFormat->lpThousandSep) { - MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, sizeof(szGrp)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, ARRAY_SIZE(szGrp)); fmt.lpThousandSep = szGrp; } if (lpFormat->lpCurrencySymbol) { - MultiByteToWideChar(cp, 0, lpFormat->lpCurrencySymbol, -1, szCy, sizeof(szCy)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpCurrencySymbol, -1, szCy, ARRAY_SIZE(szCy)); fmt.lpCurrencySymbol = szCy; } } if (lpszValue) - MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, sizeof(szIn)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, ARRAY_SIZE(szIn)); - if (cchOut > (int)(sizeof(szOut)/sizeof(WCHAR))) - cchOut = sizeof(szOut)/sizeof(WCHAR); + if (cchOut > (int) ARRAY_SIZE(szOut)) + cchOut = ARRAY_SIZE(szOut); szOut[0] = '\0'; @@ -1528,7 +1528,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, CF_CY_LEFT|CF_CY_SPACE, /* $ 1.1 */ CF_CY_RIGHT|CF_CY_SPACE, /* 1.1 $ */ }; - WCHAR szBuff[128], *szOut = szBuff + sizeof(szBuff) / sizeof(WCHAR) - 1; + WCHAR szBuff[128], *szOut = szBuff + ARRAY_SIZE(szBuff) - 1; WCHAR szNegBuff[8]; const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc, *lpszCy, *lpszCyStart; DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0, dwFmt; @@ -1559,7 +1559,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, else { GetLocaleInfoW(lcid, LOCALE_SNEGATIVESIGN|(dwFlags & LOCALE_NOUSEROVERRIDE), - szNegBuff, sizeof(szNegBuff)/sizeof(WCHAR)); + szNegBuff, ARRAY_SIZE(szNegBuff)); lpszNegStart = lpszNeg = szNegBuff; } dwFlags &= (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP); @@ -1782,6 +1782,21 @@ error: return 0; } +#if _WIN32_WINNT >= 0x600 +/*********************************************************************** + * GetCurrencyFormatEx (KERNEL32.@) + */ +int WINAPI GetCurrencyFormatEx(LPCWSTR localename, DWORD flags, LPCWSTR value, + const CURRENCYFMTW *format, LPWSTR str, int len) +{ + TRACE("(%s,0x%08x,%s,%p,%p,%d)\n", debugstr_w(localename), flags, + debugstr_w(value), format, str, len); + + return GetCurrencyFormatW( LocaleNameToLCID(localename, 0), flags, value, format, str, len); +} +#endif + + /* FIXME: Everything below here needs to move somewhere else along with the * other EnumXXX functions, when a method for storing resources for * alternate calendars is determined. @@ -1854,9 +1869,9 @@ static BOOL NLS_EnumDateFormats(const struct enumdateformats_context *ctxt) lctype |= ctxt->flags & LOCALE_USE_CP_ACP; if (ctxt->unicode) - ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, sizeof(bufW)/sizeof(bufW[0])); + ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, ARRAY_SIZE(bufW)); else - ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, sizeof(bufA)/sizeof(bufA[0])); + ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, ARRAY_SIZE(bufA)); if (ret) { @@ -1949,7 +1964,7 @@ BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) return NLS_EnumDateFormats(&ctxt); } -#ifndef __REACTOS__ +#if _WIN32_WINNT >= 0x600 /************************************************************************** * EnumDateFormatsExEx (KERNEL32.@) */ @@ -1966,7 +1981,7 @@ BOOL WINAPI EnumDateFormatsExEx(DATEFMT_ENUMPROCEXEX proc, const WCHAR *locale, return NLS_EnumDateFormats(&ctxt); } -#endif /* !__REACTOS__ */ +#endif /* _WIN32_WINNT >= 0x600 */ struct enumtimeformats_context { enum enum_callback_type type; /* callback kind */ @@ -2009,9 +2024,9 @@ static BOOL NLS_EnumTimeFormats(struct enumtimeformats_context *ctxt) lctype |= ctxt->flags & LOCALE_USE_CP_ACP; if (ctxt->unicode) - ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, sizeof(bufW)/sizeof(bufW[0])); + ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, ARRAY_SIZE(bufW)); else - ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, sizeof(bufA)/sizeof(bufA[0])); + ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, ARRAY_SIZE(bufA)); if (ret) { @@ -2073,7 +2088,7 @@ BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) return NLS_EnumTimeFormats(&ctxt); } -#ifndef __REACTOS__ +#if _WIN32_WINNT >= 0x600 /************************************************************************** * EnumTimeFormatsEx (KERNEL32.@) */ @@ -2090,7 +2105,7 @@ BOOL WINAPI EnumTimeFormatsEx(TIMEFMT_ENUMPROCEX proc, const WCHAR *locale, DWOR return NLS_EnumTimeFormats(&ctxt); } -#endif /* !__REACTOS__ */ +#endif /* _WIN32_WINNT >= 0x600 */ struct enumcalendar_context { enum enum_callback_type type; /* callback kind */ @@ -2321,7 +2336,7 @@ BOOL WINAPI EnumCalendarInfoExW( CALINFO_ENUMPROCEXW calinfoproc,LCID locale, return NLS_EnumCalendarInfo(&ctxt); } -#ifndef __REACTOS__ +#if _WIN32_WINNT >= 0x600 /****************************************************************************** * EnumCalendarInfoExEx [KERNEL32.@] */ @@ -2341,7 +2356,7 @@ BOOL WINAPI EnumCalendarInfoExEx( CALINFO_ENUMPROCEXEX calinfoproc, LPCWSTR loca ctxt.unicode = TRUE; return NLS_EnumCalendarInfo(&ctxt); } -#endif /* !__REACTOS__ */ +#endif /* _WIN32_WINNT >= 0x600 */ /********************************************************************* * GetCalendarInfoA (KERNEL32.@) @@ -2567,6 +2582,23 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, return 0; } +#if _WIN32_WINNT >= 0x600 +/********************************************************************* + * GetCalendarInfoEx (KERNEL32.@) + */ +int WINAPI GetCalendarInfoEx(LPCWSTR locale, CALID calendar, LPCWSTR lpReserved, CALTYPE caltype, + LPWSTR data, int len, DWORD *value) +{ + static int once; + + LCID lcid = LocaleNameToLCID(locale, 0); + if (!once++) + FIXME("(%s, %d, %p, 0x%08x, %p, %d, %p): semi-stub\n", debugstr_w(locale), calendar, lpReserved, caltype, + data, len, value); + return GetCalendarInfoW(lcid, calendar, caltype, data, len, value); +} +#endif + /********************************************************************* * SetCalendarInfoA (KERNEL32.@) * diff --git a/dll/win32/kernel32/winnls/string/nls.c b/dll/win32/kernel32/winnls/string/nls.c index 86449e877d..391eca8fae 100644 --- a/dll/win32/kernel32/winnls/string/nls.c +++ b/dll/win32/kernel32/winnls/string/nls.c @@ -2261,4 +2261,17 @@ GetNLSVersion(IN NLS_FUNCTION Function, return TRUE; } +/* + * @unimplemented + */ +BOOL +WINAPI +GetNLSVersionEx(IN NLS_FUNCTION function, + IN LPCWSTR lpLocaleName, + IN OUT LPNLSVERSIONINFOEX lpVersionInformation) +{ + STUB; + return TRUE; +} + /* EOF */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 9b59c155a3..4b31162daa 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -283,7 +283,7 @@ kernel32 - reactos/dll/win32/kernel32/winnls/string/fold.c # Synced to WineStaging-3.3 reactos/dll/win32/kernel32/winnls/string/format_msg.c # Synced to WineStaging-3.3 reactos/dll/win32/kernel32/winnls/string/lang.c # Synced in r52754 - reactos/dll/win32/kernel32/winnls/string/lcformat.c # Synced to WineStaging-3.3 + reactos/dll/win32/kernel32/winnls/string/lcformat.c # Synced to WineStaging-3.21 reactos/dll/win32/kernel32/winnls/string/nls.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced to WineStaging-3.3 diff --git a/sdk/include/psdk/winnls.h b/sdk/include/psdk/winnls.h index eb9f94844a..61baa71dce 100644 --- a/sdk/include/psdk/winnls.h +++ b/sdk/include/psdk/winnls.h @@ -198,6 +198,15 @@ extern "C" { #define LCID_INSTALLED 1 #define LCID_SUPPORTED 2 #define LCID_ALTERNATE_SORTS 4 + +#define LOCALE_ALL 0x00 +#define LOCALE_WINDOWS 0x01 +#define LOCALE_SUPPLEMENTAL 0x02 +#define LOCALE_ALTERNATE_SORTS 0x04 +#define LOCALE_REPLACEMENT 0x08 +#define LOCALE_NEUTRALDATA 0x10 +#define LOCALE_SPECIFICDATA 0x20 + #define MAP_FOLDCZONE 16 #define MAP_FOLDDIGITS 128 #define MAP_PRECOMPOSED 32 @@ -611,6 +620,13 @@ typedef struct nlsversioninfo { DWORD dwNLSVersion; DWORD dwDefinedVersion; } NLSVERSIONINFO,*LPNLSVERSIONINFO; +typedef struct _nlsversioninfoex { + DWORD dwNLSVersionInfoSize; + DWORD dwNLSVersion; + DWORD dwDefinedVersion; + DWORD dwEffectiveId; + GUID guidCustomVersion; +} NLSVERSIONINFOEX, *LPNLSVERSIONINFOEX; typedef struct _numberfmtA { UINT NumDigits; UINT LeadingZero; @@ -760,6 +776,7 @@ GetCurrencyFormatW( int WINAPI GetDateFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,int); int WINAPI GetDateFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int); +int WINAPI GetDateFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int,LPCWSTR); int WINAPI @@ -797,6 +814,13 @@ GetLocaleInfoW( BOOL WINAPI GetNLSVersion(_In_ NLS_FUNCTION, _In_ LCID, _Inout_ LPNLSVERSIONINFO); +BOOL +WINAPI +GetNLSVersionEx( + _In_ NLS_FUNCTION function, + _In_ LPCWSTR lpLocaleName, + _Inout_ LPNLSVERSIONINFOEX lpVersionInformation); + int WINAPI GetNumberFormatA( @@ -859,6 +883,7 @@ LCID WINAPI GetSystemDefaultLCID(void); LCID WINAPI GetThreadLocale(void); int WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,int); int WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int); +int WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int); LANGID WINAPI GetUserDefaultLangID(void); LCID WINAPI GetUserDefaultLCID(void); GEOID WINAPI GetUserGeoID(_In_ GEOCLASS); @@ -978,6 +1003,8 @@ GetLocaleInfoEx( _Out_writes_opt_(cchData) LPWSTR lpLCData, _In_ int cchData); +BOOL WINAPI IsValidLocaleName(_In_ LPCWSTR lpLocaleName); + BOOL WINAPI GetProcessPreferredUILanguages( @@ -1076,6 +1103,8 @@ GetStringScripts( BOOL WINAPI SetProcessPreferredUILanguages(_In_ DWORD, _In_opt_ PCZZWSTR, _Out_opt_ PULONG); BOOL WINAPI SetThreadPreferredUILanguages(_In_ DWORD, _In_opt_ PCZZWSTR, _Out_opt_ PULONG); BOOL WINAPI VerifyScripts(_In_ DWORD, _In_ LPCWSTR, _In_ int, _In_ LPCWSTR, _In_ int); +INT WINAPI LCMapStringEx(_In_ LPCWSTR, _In_ DWORD, _In_ LPCWSTR, _In_ INT, _Out_opt_ LPWSTR, _In_ INT, _In_ LPNLSVERSIONINFO, _In_ LPVOID, _In_ LPARAM); +LCID WINAPI LocaleNameToLCID(_In_ LPCWSTR, _In_ DWORD); #endif /* (WINVER >= 0x0600) */

6 years

[reactos] 01/01: [WIN32SS:NTUSER] Completely update the metrics in co_IntInitializeDesktopGraphics().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca24df9c85ac0883cce43… commit ca24df9c85ac0883cce43641c9083aa0ef03d9f4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 5 16:36:30 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 5 16:42:16 2019 +0100 [WIN32SS:NTUSER] Completely update the metrics in co_IntInitializeDesktopGraphics(). This change is similar to what is done in UserChangeDisplaySettings() after changing screen video mode. This allows e.g. having windows to be correctly maximized during 2nd-stage GUI setup. To compare and reproduce during 2nd-stage GUI setup, open cmd.exe (Shift-F10) and from there a GUI app, e.g. regedit.exe, and maximize it. Observe the limits used by the window. --- win32ss/user/ntuser/winsta.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index 4556e7412e..033c7a1e77 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -271,7 +271,7 @@ co_IntInitializeDesktopGraphics(VOID) } GreSetDCOwner(ScreenDeviceContext, GDI_OBJ_HMGR_PUBLIC); - if (! IntCreatePrimarySurface()) + if (!IntCreatePrimarySurface()) { return FALSE; } @@ -281,6 +281,12 @@ co_IntInitializeDesktopGraphics(VOID) NtGdiSelectFont(hSystemBM, NtGdiGetStockObject(SYSTEM_FONT)); GreSetDCOwner(hSystemBM, GDI_OBJ_HMGR_PUBLIC); + /* Update the system metrics */ + InitMetrics(); + + /* Set new size of the monitor */ + UserUpdateMonitorSize((HDEV)gppdevPrimary); + /* Update the SERVERINFO */ gpsi->aiSysMet[SM_CXSCREEN] = gppdevPrimary->gdiinfo.ulHorzRes; gpsi->aiSysMet[SM_CYSCREEN] = gppdevPrimary->gdiinfo.ulVertRes; @@ -293,7 +299,9 @@ co_IntInitializeDesktopGraphics(VOID) gpsi->PUSIFlags |= PUSIF_PALETTEDISPLAY; } else + { gpsi->PUSIFlags &= ~PUSIF_PALETTEDISPLAY; + } // Font is realized and this dc was previously set to internal DC_ATTR. gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw, (DWORD*)&gpsi->cySysFontChar); gpsi->tmSysFont = tmw;

6 years

[reactos] 01/01: Resource file strings cleanup (#581)

by David Quintana

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01e5cb0c0423dfef5c6e3… commit 01e5cb0c0423dfef5c6e34ceb0c4bf9f29a3f5f8 Author: David Quintana <gigaherz(a)gmail.com> AuthorDate: Sat Jan 5 15:44:16 2019 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 5 15:44:16 2019 +0100 Resource file strings cleanup (#581) [CMDUTILS/AT] Fix missing translation strings in certain files. [NOTEPAD] Fix SUBLANG code to brazillian. [RAPPS] Fix missing translation strings in certain files. [FDEBUG] Fix translation string ID. [CPL/INPUT] Fix missing translation strings in certain files. [ACPPAGE] Fix incorrect resource IDs. [NETSHELL] Fix incorrect resource IDs. [DEVMGR] Fix missing translation strings in certain files. [LSASRV] Fix missing translation strings in certain files. [RASDLG] Fix missing translation strings in certain files. [SHELL32] Fix missing translation strings and incorrect resource IDs. [TAPIUI] Fix missing translation strings in certain files. [WINFILE] Fix incorrect resource IDs. [NTVDM] Fix missing translation strings in certain files. [USERSRV] Fix missing translation strings in certain files. [BROWSEUI] One more missing string. [FLTMC] Fix missing translation strings in certain files. Detected using the TransDiffer tool (early alpha). This doesn't include everything anymore, but I wanted to get the PR out of the way. --- base/applications/cmdutils/at/lang/ru-RU.rc | 1 + base/applications/fltmc/lang/bg-BG.rc | 6 +++- base/applications/fltmc/lang/cs-CZ.rc | 6 +++- base/applications/fltmc/lang/de-DE.rc | 6 +++- base/applications/fltmc/lang/en-US.rc | 1 - base/applications/fltmc/lang/es-ES.rc | 6 +++- base/applications/fltmc/lang/fr-FR.rc | 6 +++- base/applications/fltmc/lang/it-IT.rc | 6 +++- base/applications/fltmc/lang/pl-PL.rc | 6 +++- base/applications/fltmc/lang/ro-RO.rc | 6 +++- base/applications/fltmc/lang/ru-RU.rc | 6 +++- base/applications/fltmc/lang/sq-AL.rc | 6 +++- base/applications/fltmc/lang/sv-SE.rc | 6 +++- base/applications/fltmc/lang/tr-TR.rc | 6 +++- base/applications/fltmc/lang/uk-UA.rc | 6 +++- base/applications/fltmc/lang/zh-CN.rc | 6 +++- base/applications/fltmc/lang/zh-TW.rc | 6 +++- base/applications/notepad/lang/pt-BR.rc | 2 +- base/applications/rapps/lang/no-NO.rc | 1 + boot/freeldr/fdebug/lang/ro-RO.rc | 2 +- dll/cpl/input/lang/ja-JP.rc | 1 + dll/shellext/acppage/lang/bg-BG.rc | 2 +- dll/shellext/acppage/lang/cs-CZ.rc | 2 +- dll/shellext/acppage/lang/de-DE.rc | 2 +- dll/shellext/acppage/lang/es-ES.rc | 2 +- dll/shellext/acppage/lang/eu-ES.rc | 2 +- dll/shellext/acppage/lang/fr-FR.rc | 2 +- dll/shellext/acppage/lang/he-IL.rc | 2 +- dll/shellext/acppage/lang/hu-HU.rc | 2 +- dll/shellext/acppage/lang/id-ID.rc | 2 +- dll/shellext/acppage/lang/it-IT.rc | 2 +- dll/shellext/acppage/lang/nl-NL.rc | 2 +- dll/shellext/acppage/lang/no-NO.rc | 2 +- dll/shellext/acppage/lang/pl-PL.rc | 2 +- dll/shellext/acppage/lang/sk-SK.rc | 2 +- dll/shellext/acppage/lang/sq-AL.rc | 2 +- dll/shellext/acppage/lang/sv-SE.rc | 2 +- dll/shellext/acppage/lang/uk-UA.rc | 2 +- dll/shellext/acppage/lang/zh-CN.rc | 2 +- dll/shellext/acppage/lang/zh-TW.rc | 2 +- dll/shellext/netshell/lang/da-DK.rc | 2 +- dll/shellext/netshell/lang/el-GR.rc | 2 +- dll/shellext/netshell/lang/hu-HU.rc | 2 +- dll/shellext/netshell/lang/id-ID.rc | 2 +- dll/shellext/netshell/lang/sv-SE.rc | 2 +- dll/shellext/netshell/lang/zh-CN.rc | 2 +- dll/shellext/netshell/lang/zh-TW.rc | 2 +- dll/win32/browseui/lang/hi-IN.rc | 1 + dll/win32/devmgr/lang/cs-CZ.rc | 1 + dll/win32/lsasrv/lang/it-IT.rc | 33 ++++++++++++++++++++++ dll/win32/lsasrv/lang/sq-AL.rc | 33 ++++++++++++++++++++++ dll/win32/lsasrv/lang/tr-TR.rc | 33 ++++++++++++++++++++++ dll/win32/lsasrv/lang/zh-CN.rc | 33 ++++++++++++++++++++++ dll/win32/lsasrv/lang/zh-TW.rc | 32 +++++++++++++++++++++ dll/win32/rasdlg/lang/no-NO.rc | 1 + dll/win32/shell32/lang/bg-BG.rc | 5 ++-- dll/win32/shell32/lang/ca-ES.rc | 5 ++-- dll/win32/shell32/lang/cs-CZ.rc | 25 ++++++++++++++-- dll/win32/shell32/lang/da-DK.rc | 5 ++-- dll/win32/shell32/lang/de-DE.rc | 5 ++-- dll/win32/shell32/lang/el-GR.rc | 1 + dll/win32/shell32/lang/en-GB.rc | 5 ++-- dll/win32/shell32/lang/en-US.rc | 4 +-- dll/win32/shell32/lang/es-ES.rc | 5 ++-- dll/win32/shell32/lang/et-EE.rc | 4 +-- dll/win32/shell32/lang/fi-FI.rc | 5 ++-- dll/win32/shell32/lang/fr-FR.rc | 5 ++-- dll/win32/shell32/lang/he-IL.rc | 5 ++-- dll/win32/shell32/lang/hi-IN.rc | 4 +-- dll/win32/shell32/lang/hu-HU.rc | 5 ++-- dll/win32/shell32/lang/it-IT.rc | 5 ++-- dll/win32/shell32/lang/ja-JP.rc | 5 ++-- dll/win32/shell32/lang/ko-KR.rc | 5 ++-- dll/win32/shell32/lang/nl-NL.rc | 5 ++-- dll/win32/shell32/lang/no-NO.rc | 1 + dll/win32/shell32/lang/pl-PL.rc | 4 +-- dll/win32/shell32/lang/pt-BR.rc | 5 ++-- dll/win32/shell32/lang/pt-PT.rc | 5 ++-- dll/win32/shell32/lang/ro-RO.rc | 7 +++-- dll/win32/shell32/lang/ru-RU.rc | 1 + dll/win32/shell32/lang/sk-SK.rc | 5 ++-- dll/win32/shell32/lang/sl-SI.rc | 7 +++-- dll/win32/shell32/lang/sq-AL.rc | 5 ++-- dll/win32/shell32/lang/sv-SE.rc | 5 ++-- dll/win32/shell32/lang/tr-TR.rc | 5 ++-- dll/win32/shell32/lang/uk-UA.rc | 5 ++-- dll/win32/shell32/lang/zh-CN.rc | 5 ++-- dll/win32/shell32/lang/zh-TW.rc | 5 ++-- dll/win32/tapiui/lang/de-DE.rc | 1 + modules/rosapps/applications/winfile/lang/pl-PL.rc | 10 +++---- subsystems/mvdm/ntvdm/lang/zh-CN.rc | 7 +++++ win32ss/user/winsrv/usersrv/lang/hu-HU.rc | 17 +++++++++++ 92 files changed, 414 insertions(+), 111 deletions(-) diff --git a/base/applications/cmdutils/at/lang/ru-RU.rc b/base/applications/cmdutils/at/lang/ru-RU.rc index 00e4ecd062..f70dd53a46 100644 --- a/base/applications/cmdutils/at/lang/ru-RU.rc +++ b/base/applications/cmdutils/at/lang/ru-RU.rc @@ -31,6 +31,7 @@ id Порядковый номер запланированно IDS_CONFIRM_YES "Y" IDS_CONFIRM_NO "N" + IDS_DELETE_ALL "This operation will delete all scheduled jobs.\n" IDS_NEW_JOB "Добавлено новое задание с ID = %lu\n" IDS_JOBS_LIST "Статус ID День Время Команда\n" IDS_NO_ENTRIES "В списке нет запланированных задач.\n" diff --git a/base/applications/fltmc/lang/bg-BG.rc b/base/applications/fltmc/lang/bg-BG.rc index d2c410ac38..ce8f93c05f 100644 --- a/base/applications/fltmc/lang/bg-BG.rc +++ b/base/applications/fltmc/lang/bg-BG.rc @@ -5,17 +5,20 @@ BEGIN IDS_USAGE "\nValid commands :\n\ load Loads a Filter driver\n\ unload Unloads a Filter driver\n\ - filters Lists the Filters currently registered in the system\n\n" + filters Lists the Filters currently registered in the system\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Loads a filter driver\n" IDS_USAGE_UNLOAD "Unloads a filter driver\n" IDS_USAGE_FILTERS "Lists all registered filters\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n" IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -24,4 +27,5 @@ BEGIN IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n" IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n" IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/cs-CZ.rc b/base/applications/fltmc/lang/cs-CZ.rc index c0f0587d79..31818e02b4 100644 --- a/base/applications/fltmc/lang/cs-CZ.rc +++ b/base/applications/fltmc/lang/cs-CZ.rc @@ -5,17 +5,20 @@ BEGIN IDS_USAGE "\nValid commands :\n\ load Loads a Filter driver\n\ unload Unloads a Filter driver\n\ - filters Lists the Filters currently registered in the system\n\n" + filters Lists the Filters currently registered in the system\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Loads a filter driver\n" IDS_USAGE_UNLOAD "Unloads a filter driver\n" IDS_USAGE_FILTERS "Lists all registered filters\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n" IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -24,4 +27,5 @@ BEGIN IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n" IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n" IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/de-DE.rc b/base/applications/fltmc/lang/de-DE.rc index f796fc113d..6d7145df68 100644 --- a/base/applications/fltmc/lang/de-DE.rc +++ b/base/applications/fltmc/lang/de-DE.rc @@ -5,17 +5,20 @@ BEGIN IDS_USAGE "\nValid commands :\n\ load Loads a Filter driver\n\ unload Unloads a Filter driver\n\ - filters Lists the Filters currently registered in the system\n\n" + filters Lists the Filters currently registered in the system\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Loads a filter driver\n" IDS_USAGE_UNLOAD "Unloads a filter driver\n" IDS_USAGE_FILTERS "Lists all registered filters\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n" IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -24,4 +27,5 @@ BEGIN IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n" IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n" IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/en-US.rc b/base/applications/fltmc/lang/en-US.rc index 728063f3bb..b35472356d 100644 --- a/base/applications/fltmc/lang/en-US.rc +++ b/base/applications/fltmc/lang/en-US.rc @@ -7,7 +7,6 @@ BEGIN unload Unloads a Filter driver\n\ filters Lists the Filters currently registered in the system\n\ volumes Lists all volumes\n\n" - IDS_USAGE_LOAD "Loads a filter driver\n" IDS_USAGE_UNLOAD "Unloads a filter driver\n" diff --git a/base/applications/fltmc/lang/es-ES.rc b/base/applications/fltmc/lang/es-ES.rc index 4a60da641f..eacd39911c 100644 --- a/base/applications/fltmc/lang/es-ES.rc +++ b/base/applications/fltmc/lang/es-ES.rc @@ -5,17 +5,20 @@ BEGIN IDS_USAGE "\nValid commands :\n\ load Loads a Filter driver\n\ unload Unloads a Filter driver\n\ - filters Lists the Filters currently registered in the system\n\n" + filters Lists the Filters currently registered in the system\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Loads a filter driver\n" IDS_USAGE_UNLOAD "Unloads a filter driver\n" IDS_USAGE_FILTERS "Lists all registered filters\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n" IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -24,4 +27,5 @@ BEGIN IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n" IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n" IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/fr-FR.rc b/base/applications/fltmc/lang/fr-FR.rc index a927ddf768..0eba0fccd9 100644 --- a/base/applications/fltmc/lang/fr-FR.rc +++ b/base/applications/fltmc/lang/fr-FR.rc @@ -5,17 +5,20 @@ BEGIN IDS_USAGE "\nValid commands :\n\ load Loads a Filter driver\n\ unload Unloads a Filter driver\n\ - filters Lists the Filters currently registered in the system\n\n" + filters Lists the Filters currently registered in the system\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Loads a filter driver\n" IDS_USAGE_UNLOAD "Unloads a filter driver\n" IDS_USAGE_FILTERS "Lists all registered filters\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n" IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -24,4 +27,5 @@ BEGIN IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n" IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n" IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/it-IT.rc b/base/applications/fltmc/lang/it-IT.rc index 4808d17104..0ab4430670 100644 --- a/base/applications/fltmc/lang/it-IT.rc +++ b/base/applications/fltmc/lang/it-IT.rc @@ -5,17 +5,20 @@ BEGIN IDS_USAGE "\nValid commands :\n\ load Loads a Filter driver\n\ unload Unloads a Filter driver\n\ - filters Lists the Filters currently registered in the system\n\n" + filters Lists the Filters currently registered in the system\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Loads a filter driver\n" IDS_USAGE_UNLOAD "Unloads a filter driver\n" IDS_USAGE_FILTERS "Lists all registered filters\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n" IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -24,4 +27,5 @@ BEGIN IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n" IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n" IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/pl-PL.rc b/base/applications/fltmc/lang/pl-PL.rc index 5a33ba79f7..97bb55b74a 100644 --- a/base/applications/fltmc/lang/pl-PL.rc +++ b/base/applications/fltmc/lang/pl-PL.rc @@ -5,17 +5,20 @@ BEGIN IDS_USAGE "\nPrawidłowe polecenia:\n\ load Ładuje sterownik filtra\n\ unload Wyładowuje sterownik filtra\n\ - filters Wyświetla listę aktualnie zarejestrowanych filtrów\n\n" + filters Wyświetla listę aktualnie zarejestrowanych filtrów\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Ładuje sterownik filtra\n" IDS_USAGE_UNLOAD "Wyładowuje sterownik filtra\n" IDS_USAGE_FILTERS "Wyświetla listę zarejestrowanych filtrów\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Nazwa filtra Liczba wystąpień Wysokość Ramka\n" IDS_DISPLAY_FILTERS2 "Nazwa filtra Liczba wystąpień Ramka\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -24,4 +27,5 @@ BEGIN IDS_ERROR_FILTERS "Nie udało się wyświetlić listy filtrów (0x%X)\n" IDS_ERROR_LOAD "Nie udało się załadować filtra (0x%X)\n" IDS_ERROR_UNLOAD "Nie udało się wyładować filtra (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/ro-RO.rc b/base/applications/fltmc/lang/ro-RO.rc index dca313e40c..c4cdc9c776 100644 --- a/base/applications/fltmc/lang/ro-RO.rc +++ b/base/applications/fltmc/lang/ro-RO.rc @@ -7,17 +7,20 @@ BEGIN IDS_USAGE "\nComenzi valide:\n\ load Încarcă un modul-pilot de tip filtru\n\ unload Descarcă un modul-pilot de tip filtru\n\ - filters Afișează filtrele înregistrate acum în sistem\n\n" + filters Afișează filtrele înregistrate acum în sistem\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Încarcă un modul-pilot de tip filtru\n" IDS_USAGE_UNLOAD "Descarcă un modul-pilot de tip filtru\n" IDS_USAGE_FILTERS "Afișează toate filtrele înregistrate\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Nume de filtru Num Instanțe Altitudine Cadru\n" IDS_DISPLAY_FILTERS2 "Nume de filtru Num Instanțe Cadru\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -26,4 +29,5 @@ BEGIN IDS_ERROR_FILTERS "Eșec la afișarea filtrelor (0x%X)\n" IDS_ERROR_LOAD "Eșec la încărcarea filtrului (0x%X)\n" IDS_ERROR_UNLOAD "Eșec la descărcarea filtrului (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/ru-RU.rc b/base/applications/fltmc/lang/ru-RU.rc index 42c4ad3183..242ce3e1c0 100644 --- a/base/applications/fltmc/lang/ru-RU.rc +++ b/base/applications/fltmc/lang/ru-RU.rc @@ -5,17 +5,20 @@ BEGIN IDS_USAGE "\nДопустимые команды :\n\ load Загрузить драйвер фильтра\n\ unload Выгрузить драйвер фильтра\n\ - filters Список фильтров, зарегистрированных в системе\n\n" + filters Список фильтров, зарегистрированных в системе\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Загружает драйвер фильтра\n" IDS_USAGE_UNLOAD "Выгружает драйвер фильтра\n" IDS_USAGE_FILTERS "Выводит список всех зарегистрированных фильтров\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n" IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -24,4 +27,5 @@ BEGIN IDS_ERROR_FILTERS "Не удалось получить список фильтров (0x%X)\n" IDS_ERROR_LOAD "Не удалось загрузить фильтр (0x%X)\n" IDS_ERROR_UNLOAD "Не удалось выгрузить фильтр (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/sq-AL.rc b/base/applications/fltmc/lang/sq-AL.rc index 890a5c3e3f..741c5cd3c7 100644 --- a/base/applications/fltmc/lang/sq-AL.rc +++ b/base/applications/fltmc/lang/sq-AL.rc @@ -5,17 +5,20 @@ BEGIN IDS_USAGE "\nValid commands :\n\ load Loads a Filter driver\n\ unload Unloads a Filter driver\n\ - filters Lists the Filters currently registered in the system\n\n" + filters Lists the Filters currently registered in the system\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Loads a filter driver\n" IDS_USAGE_UNLOAD "Unloads a filter driver\n" IDS_USAGE_FILTERS "Lists all registered filters\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n" IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -24,4 +27,5 @@ BEGIN IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n" IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n" IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/sv-SE.rc b/base/applications/fltmc/lang/sv-SE.rc index a03fdf3cf3..ceec7d4d9d 100644 --- a/base/applications/fltmc/lang/sv-SE.rc +++ b/base/applications/fltmc/lang/sv-SE.rc @@ -5,17 +5,20 @@ BEGIN IDS_USAGE "\nValid commands :\n\ load Loads a Filter driver\n\ unload Unloads a Filter driver\n\ - filters Lists the Filters currently registered in the system\n\n" + filters Lists the Filters currently registered in the system\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Loads a filter driver\n" IDS_USAGE_UNLOAD "Unloads a filter driver\n" IDS_USAGE_FILTERS "Lists all registered filters\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n" IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -24,4 +27,5 @@ BEGIN IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n" IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n" IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/tr-TR.rc b/base/applications/fltmc/lang/tr-TR.rc index 76b568266f..a926205472 100644 --- a/base/applications/fltmc/lang/tr-TR.rc +++ b/base/applications/fltmc/lang/tr-TR.rc @@ -7,17 +7,20 @@ BEGIN IDS_USAGE "\nGeçerli komutlar:\n\ load Bir süzgeç sürücüsünü yükler\n\ unload Bir süzgeç sürücüsünü kaldırır\n\ - filters Dizgede şimdilik kayıtlı süzgeçleri dizelgeler\n\n" + filters Dizgede şimdilik kayıtlı süzgeçleri dizelgeler\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Bir süzgeç sürücüsünü yükler\n" IDS_USAGE_UNLOAD "Bir süzgeç sürücüsünü kaldırır\n" IDS_USAGE_FILTERS "Kayıtlı tüm süzgeçleri dizelgeler\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Süzgeç Adı Örnek Sayısı Yükseklik Kare\n" IDS_DISPLAY_FILTERS2 "Süzgeç Adı Örnek Sayısı Kare\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -26,4 +29,5 @@ BEGIN IDS_ERROR_FILTERS "Süzgeçleri dizelgeleme başarısız (0x%X)\n" IDS_ERROR_LOAD "Süzgeçleri yükleme başarısız (0x%X)\n" IDS_ERROR_UNLOAD "Süzgeçleri kaldırma başarısız (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/uk-UA.rc b/base/applications/fltmc/lang/uk-UA.rc index c3cdccf9ea..b0c270a5b9 100644 --- a/base/applications/fltmc/lang/uk-UA.rc +++ b/base/applications/fltmc/lang/uk-UA.rc @@ -5,17 +5,20 @@ BEGIN IDS_USAGE "\nValid commands :\n\ load Loads a Filter driver\n\ unload Unloads a Filter driver\n\ - filters Lists the Filters currently registered in the system\n\n" + filters Lists the Filters currently registered in the system\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Loads a filter driver\n" IDS_USAGE_UNLOAD "Unloads a filter driver\n" IDS_USAGE_FILTERS "Lists all registered filters\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n" IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -24,4 +27,5 @@ BEGIN IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n" IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n" IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/zh-CN.rc b/base/applications/fltmc/lang/zh-CN.rc index 7c62d69b1a..984615e3e1 100644 --- a/base/applications/fltmc/lang/zh-CN.rc +++ b/base/applications/fltmc/lang/zh-CN.rc @@ -5,17 +5,20 @@ BEGIN IDS_USAGE "\n有效的命令 :\n\ load 加载一个过滤驱动\n\ unload 卸载一个过滤驱动\n\ - filters 显示已在系统中注册的过滤驱动列表\n\n" + filters 显示已在系统中注册的过滤驱动列表\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "加载一个过滤驱动\n" IDS_USAGE_UNLOAD "卸载一个过滤驱动\n" IDS_USAGE_FILTERS "显示已在系统中注册的过滤驱动列表\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "过滤驱动名称数目实例权值帧\n" IDS_DISPLAY_FILTERS2 "过滤驱动名称数目实例帧\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -24,4 +27,5 @@ BEGIN IDS_ERROR_FILTERS "无法列举过滤驱动列表 (0x%X)\n" IDS_ERROR_LOAD "无法加载过滤驱动 (0x%X)\n" IDS_ERROR_UNLOAD "无法卸载过滤驱动 (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/fltmc/lang/zh-TW.rc b/base/applications/fltmc/lang/zh-TW.rc index 5dcc8a8279..ed42682eea 100644 --- a/base/applications/fltmc/lang/zh-TW.rc +++ b/base/applications/fltmc/lang/zh-TW.rc @@ -5,17 +5,20 @@ BEGIN IDS_USAGE "\nValid commands :\n\ load Loads a Filter driver\n\ unload Unloads a Filter driver\n\ - filters Lists the Filters currently registered in the system\n\n" + filters Lists the Filters currently registered in the system\n\n\ + volumes Lists all volumes\n\n" IDS_USAGE_LOAD "Loads a filter driver\n" IDS_USAGE_UNLOAD "Unloads a filter driver\n" IDS_USAGE_FILTERS "Lists all registered filters\n" + IDS_USAGE_VOLUMES "Lists all volumes\n" END STRINGTABLE BEGIN IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n" IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n" + IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n" END STRINGTABLE @@ -24,4 +27,5 @@ BEGIN IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n" IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n" IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n" + IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n" END diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc index c53be7640f..4e4c487c85 100644 --- a/base/applications/notepad/lang/pt-BR.rc +++ b/base/applications/notepad/lang/pt-BR.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN ID_ACCEL ACCELERATORS BEGIN diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index c2d7a4835e..5294e62c7d 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -158,6 +158,7 @@ BEGIN IDS_AINFO_URLSITE "\nHjemmeside: " IDS_AINFO_LICENSE "\nLisens: " IDS_AINFO_URLDOWNLOAD "\nNedlasting: " + IDS_AINFO_LANGUAGES "\nLanguages: " END STRINGTABLE diff --git a/boot/freeldr/fdebug/lang/ro-RO.rc b/boot/freeldr/fdebug/lang/ro-RO.rc index 5bedfd5fa9..522d9535a7 100644 --- a/boot/freeldr/fdebug/lang/ro-RO.rc +++ b/boot/freeldr/fdebug/lang/ro-RO.rc @@ -40,7 +40,7 @@ CAPTION "Despre depanatorul FreeLoader" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Depanatorul FreeLoader v1.0\nDrept de autor (C) 2003\nde Brian Palmer (brianp(a)reactos.org)", IDC_STATIC, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 53, 28, 122, 26 - DEFPUSHBUTTON "Î&nchide", 183, 189, 44, 14, WS_GROUP + DEFPUSHBUTTON "Î&nchide", IDOK, 189, 44, 14, WS_GROUP ICON IDI_FDEBUG, IDC_STATIC, 19, 30, 20, 20 EDITTEXT IDC_LICENSE_EDIT, 53, 63, 174, 107, ES_MULTILINE | ES_READONLY | WS_VSCROLL END diff --git a/dll/cpl/input/lang/ja-JP.rc b/dll/cpl/input/lang/ja-JP.rc index 5456447899..0257bb8ed5 100644 --- a/dll/cpl/input/lang/ja-JP.rc +++ b/dll/cpl/input/lang/ja-JP.rc @@ -161,6 +161,7 @@ BEGIN IDS_DIVEHI_PHONETIC_LAYOUT "ディベヒ語音素" IDS_DIVEHI_TYPEWRITER_LAYOUT "ディベヒ語タイプライター" IDS_DUTCH_LAYOUT "オランダ語" + IDS_ESPERANTO_LAYOUT "Esperanto" IDS_ESTONIAN_LAYOUT "エストニア語" IDS_FAEROESE_LAYOUT "フェロー語" IDS_FARSI_LAYOUT "現代ペルシャ語" diff --git a/dll/shellext/acppage/lang/bg-BG.rc b/dll/shellext/acppage/lang/bg-BG.rc index e0a98de9ae..48ba265722 100644 --- a/dll/shellext/acppage/lang/bg-BG.rc +++ b/dll/shellext/acppage/lang/bg-BG.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Съвместимост" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ако имате затруднения при работата на приложението с РеактОС, изберете като коя операционна система да му се представя РеактОС.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Ако имате затруднения при работата на приложението с РеактОС, изберете като коя операционна система да му се представя РеактОС.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Режими на съвместимост", IDC_COMPATGROUP, 7, 41, 225, 49 CHECKBOX "Изпълняване на приложението в режим на съвместимост за:", IDC_CHKRUNCOMPATIBILITY, 10, 57, 220, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 10, 70, 220, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/cs-CZ.rc b/dll/shellext/acppage/lang/cs-CZ.rc index b2f5e3710e..2ba59989ed 100644 --- a/dll/shellext/acppage/lang/cs-CZ.rc +++ b/dll/shellext/acppage/lang/cs-CZ.rc @@ -10,7 +10,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Kompatibilita" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Pokud jsou problémy se spouštěním tohoto programu v systému ReactOS, zvolte operační systém, který ReactOS tomuto programu sdělí.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Pokud jsou problémy se spouštěním tohoto programu v systému ReactOS, zvolte operační systém, který ReactOS tomuto programu sdělí.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Režim kompatibility", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Spustit tento program v režimu kompatibility pro:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/de-DE.rc b/dll/shellext/acppage/lang/de-DE.rc index 572fd30697..e248b9744c 100644 --- a/dll/shellext/acppage/lang/de-DE.rc +++ b/dll/shellext/acppage/lang/de-DE.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Kompatibilität" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Falls dieses Programm Probleme verursacht, wählen Sie einen Kompatibilitätsmodus, unter dem das Programm möglicherweise korrekt funktioniert.\nBitte beachten Sie dass sich diese Funktion aktuell in Entwicklung befindet.", -1, 7, 7, 210, 31 + LTEXT "Falls dieses Programm Probleme verursacht, wählen Sie einen Kompatibilitätsmodus, unter dem das Programm möglicherweise korrekt funktioniert.\nBitte beachten Sie dass sich diese Funktion aktuell in Entwicklung befindet.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Kompatibilitätsmodus", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Programm im Kompatibilitätsmodus ausführen für:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/es-ES.rc b/dll/shellext/acppage/lang/es-ES.rc index 2d5e195e86..086a3136cd 100644 --- a/dll/shellext/acppage/lang/es-ES.rc +++ b/dll/shellext/acppage/lang/es-ES.rc @@ -13,7 +13,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Compatibilidad" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Si tiene problemas ejecutando este programa en ReactOS, seleccione el modo de compatibilidad que coincida con otro sistema operativo en el que funciona.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Si tiene problemas ejecutando este programa en ReactOS, seleccione el modo de compatibilidad que coincida con otro sistema operativo en el que funciona.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Modo de compatibilidad", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Ejecutar este programa en modo de compatibilidad para:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/eu-ES.rc b/dll/shellext/acppage/lang/eu-ES.rc index 85b318f7f2..f1c974c9a7 100644 --- a/dll/shellext/acppage/lang/eu-ES.rc +++ b/dll/shellext/acppage/lang/eu-ES.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Konpatibilitatea" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ReactOS programa hau exekutatzean arazoak badituzu, hautatu konpatibilitate aukera bat jada funtzionatzen duen beste sistema operatibo batekin\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "ReactOS programa hau exekutatzean arazoak badituzu, hautatu konpatibilitate aukera bat jada funtzionatzen duen beste sistema operatibo batekin\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Konpatibilitate Modua ", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Programa hau exekutatu konpatibilizatzeko moduan honekin:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/fr-FR.rc b/dll/shellext/acppage/lang/fr-FR.rc index bab739139f..9603a37c23 100644 --- a/dll/shellext/acppage/lang/fr-FR.rc +++ b/dll/shellext/acppage/lang/fr-FR.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Compatibilité" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Si vous avez des difficultés à lancer ce programme sous ReactOS, sélectionnez le système d'exploitation que ReactOS montrera à l'application.\nCette fonctionnalité est en cours de développement.", -1, 7, 7, 210, 31 + LTEXT "Si vous avez des difficultés à lancer ce programme sous ReactOS, sélectionnez le système d'exploitation que ReactOS montrera à l'application.\nCette fonctionnalité est en cours de développement.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Mode de compatibilité", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Lancer ce programme en mode de compatibilité pour :", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/he-IL.rc b/dll/shellext/acppage/lang/he-IL.rc index a7b9deb6e7..13962f2bfa 100644 --- a/dll/shellext/acppage/lang/he-IL.rc +++ b/dll/shellext/acppage/lang/he-IL.rc @@ -6,7 +6,7 @@ EXSTYLE WS_EX_LAYOUTRTL CAPTION "תאימות" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "אם הנך נתקל בבעיות בהפעלת התכנית בReactOS, אנא בחר את מערכת ההפעלה שReactOS תדווח לתכנית.", -1, 7,7,210,31 + LTEXT "אם הנך נתקל בבעיות בהפעלת התכנית בReactOS, אנא בחר את מערכת ההפעלה שReactOS תדווח לתכנית.", IDC_EXPLANATION, 7,7,210,31 GROUPBOX "מצב תאימות", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "הפעל תוכנית זו במצב תאימות עבור:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/hu-HU.rc b/dll/shellext/acppage/lang/hu-HU.rc index 4696bd8fb2..759cd3f54a 100644 --- a/dll/shellext/acppage/lang/hu-HU.rc +++ b/dll/shellext/acppage/lang/hu-HU.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Kompatibilitás" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ha probléma van, válassz ki egy operációs rendszert amit a ReactOS színlelni fog\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Ha probléma van, válassz ki egy operációs rendszert amit a ReactOS színlelni fog\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Kompatibilitási mód", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Ez a program kompatibilitási módban fut:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/id-ID.rc b/dll/shellext/acppage/lang/id-ID.rc index 52a17eb56d..9052bd7d36 100644 --- a/dll/shellext/acppage/lang/id-ID.rc +++ b/dll/shellext/acppage/lang/id-ID.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Kompatibilitas" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Jika anda mempunyai masalah menjalan program ini dalam ReactOS, pilih sistem operasi ReactOS seharusnya melaporkan atas aplikasi ini.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Jika anda mempunyai masalah menjalan program ini dalam ReactOS, pilih sistem operasi ReactOS seharusnya melaporkan atas aplikasi ini.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Mode Kompatibilitas", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Jalankan program ini dalam mode kompatibilitas:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/it-IT.rc b/dll/shellext/acppage/lang/it-IT.rc index ffa895b356..b1c4253ead 100644 --- a/dll/shellext/acppage/lang/it-IT.rc +++ b/dll/shellext/acppage/lang/it-IT.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Compatibilità" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Se ci sono problemi ad eseguire questo programma in ReactOS potete scegliere un sistema operativo da segnalare all'applicazione.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Se ci sono problemi ad eseguire questo programma in ReactOS potete scegliere un sistema operativo da segnalare all'applicazione.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Modalità compatibile", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Esegui questo programma in modalità compatibile per:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/nl-NL.rc b/dll/shellext/acppage/lang/nl-NL.rc index 00c07f807a..453a916d51 100644 --- a/dll/shellext/acppage/lang/nl-NL.rc +++ b/dll/shellext/acppage/lang/nl-NL.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Compatibiliteit" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "If you have problems running this program in ReactOS, select an operating system ReactOS should report to the application.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "If you have problems running this program in ReactOS, select an operating system ReactOS should report to the application.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Compatibility mode", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Run this program in compatibility mode for:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/no-NO.rc b/dll/shellext/acppage/lang/no-NO.rc index 61e75c9eb8..c1bdc09e1c 100644 --- a/dll/shellext/acppage/lang/no-NO.rc +++ b/dll/shellext/acppage/lang/no-NO.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Kompaktibilitet" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Hvis du har problemer med å kjøre programmer i ReactOS, velg et operativsystem ReactOS skulle fungere for programmet.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Hvis du har problemer med å kjøre programmer i ReactOS, velg et operativsystem ReactOS skulle fungere for programmet.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Kompaktibilitetsmodus", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Kjør dette programmet i kompaktibilitetsmodus for:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/pl-PL.rc b/dll/shellext/acppage/lang/pl-PL.rc index 411465f5f7..0e0a8cbdae 100644 --- a/dll/shellext/acppage/lang/pl-PL.rc +++ b/dll/shellext/acppage/lang/pl-PL.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Zgodność" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Jeżeli masz problemy z uruchamianiem tego programu w ReactOS, wybierz system operacyjny, który ReactOS powinien zgłaszać aplikacji.\nProszę pamiętać, że praca nad tą funkcją jest w toku.", -1, 7, 7, 210, 31 + LTEXT "Jeżeli masz problemy z uruchamianiem tego programu w ReactOS, wybierz system operacyjny, który ReactOS powinien zgłaszać aplikacji.\nProszę pamiętać, że praca nad tą funkcją jest w toku.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Tryb zgodności", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Uruchom ten program w trybie zgodności z:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/sk-SK.rc b/dll/shellext/acppage/lang/sk-SK.rc index 7046e68d6b..7b3f88bc68 100644 --- a/dll/shellext/acppage/lang/sk-SK.rc +++ b/dll/shellext/acppage/lang/sk-SK.rc @@ -12,7 +12,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Kompatibilita" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ak máte problémy so spustením tohto programu v systéme ReactOS, vyberte operačný systém, pod názvom ktorého sa systém ReactOS ohlási programu.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Ak máte problémy so spustením tohto programu v systéme ReactOS, vyberte operačný systém, pod názvom ktorého sa systém ReactOS ohlási programu.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Kompatibilný režim", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Tento program spustiť v režime kompatibilnom so systémom:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/sq-AL.rc b/dll/shellext/acppage/lang/sq-AL.rc index ef006378da..92f67635ea 100644 --- a/dll/shellext/acppage/lang/sq-AL.rc +++ b/dll/shellext/acppage/lang/sq-AL.rc @@ -9,7 +9,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pajtueshmëri" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Nëse keni probleme ne ekzekutimin e këtij programi në ReactOS, përzgjidhni një sistem operativ ReactOS duhet të raportojë për zbatimin.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Nëse keni probleme ne ekzekutimin e këtij programi në ReactOS, përzgjidhni një sistem operativ ReactOS duhet të raportojë për zbatimin.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Mjeti Pajtueshmërise", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Ekzekuto kete program ne menyre pajtueshmerie per:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/sv-SE.rc b/dll/shellext/acppage/lang/sv-SE.rc index 8769da7b92..e7cd9335c2 100644 --- a/dll/shellext/acppage/lang/sv-SE.rc +++ b/dll/shellext/acppage/lang/sv-SE.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Kompatibilitet" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ifall du har problem med att köra det här programmet i ReactOS, välj det operativsystem som ReactOS ska rapportera till programmet.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Ifall du har problem med att köra det här programmet i ReactOS, välj det operativsystem som ReactOS ska rapportera till programmet.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Kompatibilitetsläge", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Kör det här programmet i kompatibilitetsläge för:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/uk-UA.rc b/dll/shellext/acppage/lang/uk-UA.rc index 7e193633c8..6ce5de7f7e 100644 --- a/dll/shellext/acppage/lang/uk-UA.rc +++ b/dll/shellext/acppage/lang/uk-UA.rc @@ -13,7 +13,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Сумісність" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Якщо у Вас виникли проблеми із запуском цієї програми у ReactOS, виберіть режим сумісності з потрібною версією ОС.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Якщо у Вас виникли проблеми із запуском цієї програми у ReactOS, виберіть режим сумісності з потрібною версією ОС.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Режим сумісності", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Запускати програму в режимі сумісності для:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/zh-CN.rc b/dll/shellext/acppage/lang/zh-CN.rc index 9cc658cdf9..6412d62651 100644 --- a/dll/shellext/acppage/lang/zh-CN.rc +++ b/dll/shellext/acppage/lang/zh-CN.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "兼容性" FONT 9, "宋体", 0, 0, 0x0 BEGIN - LTEXT "如果您在 ReactOS 中运行此程序出现问题，选择 ReactOS 应报告给应用程序的操作系统。\n请注意，这是一项正在进行的工作。", -1, 7, 7, 210, 31 + LTEXT "如果您在 ReactOS 中运行此程序出现问题，选择 ReactOS 应报告给应用程序的操作系统。\n请注意，这是一项正在进行的工作。", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "兼容模式", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "用兼容模式运行这个程序:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/acppage/lang/zh-TW.rc b/dll/shellext/acppage/lang/zh-TW.rc index ecf27c19af..e9fe17cc56 100644 --- a/dll/shellext/acppage/lang/zh-TW.rc +++ b/dll/shellext/acppage/lang/zh-TW.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "相容性" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - LTEXT "如果您有問題在 ReactOS 中運行此程式，選擇 ReactOS 應報告給應用程式的作業系統。\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "如果您有問題在 ReactOS 中運行此程式，選擇 ReactOS 應報告給應用程式的作業系統。\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "相容模式", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "用相容模式運行這個程式:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED diff --git a/dll/shellext/netshell/lang/da-DK.rc b/dll/shellext/netshell/lang/da-DK.rc index 8157c44671..2d180ca61c 100644 --- a/dll/shellext/netshell/lang/da-DK.rc +++ b/dll/shellext/netshell/lang/da-DK.rc @@ -42,7 +42,7 @@ BEGIN LTEXT "Bytes:", -1, 73, 115, 44, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 RTEXT "000.000.000", IDC_RECEIVED, 134, 115, 44, 8 - PUSHBUTTON "&Egenskaber", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Egenskaber", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Deaktiver", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "", IDC_STATUS, 83, 20, 98, 8 RTEXT "", IDC_DURATION, 83, 34, 98, 8 diff --git a/dll/shellext/netshell/lang/el-GR.rc b/dll/shellext/netshell/lang/el-GR.rc index ad41251b90..c72f05a28c 100644 --- a/dll/shellext/netshell/lang/el-GR.rc +++ b/dll/shellext/netshell/lang/el-GR.rc @@ -42,7 +42,7 @@ BEGIN LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Ιδιότητες", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Ιδιότητες", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Απενεργοποίηση", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "", IDC_STATUS, 83, 20, 98, 8 RTEXT "", IDC_DURATION, 83, 34, 98, 8 diff --git a/dll/shellext/netshell/lang/hu-HU.rc b/dll/shellext/netshell/lang/hu-HU.rc index bf0bdc157e..4584e91e6c 100644 --- a/dll/shellext/netshell/lang/hu-HU.rc +++ b/dll/shellext/netshell/lang/hu-HU.rc @@ -42,7 +42,7 @@ BEGIN LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Tulajdonságok", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Tulajdonságok", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Letiltás", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "", IDC_STATUS, 83, 20, 98, 8 RTEXT "", IDC_DURATION, 83, 34, 98, 8 diff --git a/dll/shellext/netshell/lang/id-ID.rc b/dll/shellext/netshell/lang/id-ID.rc index 67cc57e601..be7e2dca0b 100644 --- a/dll/shellext/netshell/lang/id-ID.rc +++ b/dll/shellext/netshell/lang/id-ID.rc @@ -42,7 +42,7 @@ BEGIN LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Properti", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Properti", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Dimatikan", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "", IDC_STATUS, 83, 20, 98, 8 RTEXT "", IDC_DURATION, 83, 34, 98, 8 diff --git a/dll/shellext/netshell/lang/sv-SE.rc b/dll/shellext/netshell/lang/sv-SE.rc index c8069180bd..9d54a045b9 100644 --- a/dll/shellext/netshell/lang/sv-SE.rc +++ b/dll/shellext/netshell/lang/sv-SE.rc @@ -42,7 +42,7 @@ BEGIN LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Egenskaper", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Egenskaper", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Inaktivera", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "", IDC_STATUS, 83, 20, 98, 8 RTEXT "", IDC_DURATION, 83, 34, 98, 8 diff --git a/dll/shellext/netshell/lang/zh-CN.rc b/dll/shellext/netshell/lang/zh-CN.rc index 0a9dff8f10..34db5a2d0b 100644 --- a/dll/shellext/netshell/lang/zh-CN.rc +++ b/dll/shellext/netshell/lang/zh-CN.rc @@ -51,7 +51,7 @@ BEGIN LTEXT "字节数:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "属性(&P)", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "属性(&P)", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "禁用(&D)", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "", IDC_STATUS, 83, 20, 98, 8 RTEXT "", IDC_DURATION, 83, 34, 98, 8 diff --git a/dll/shellext/netshell/lang/zh-TW.rc b/dll/shellext/netshell/lang/zh-TW.rc index 4974976077..1b1c772bef 100644 --- a/dll/shellext/netshell/lang/zh-TW.rc +++ b/dll/shellext/netshell/lang/zh-TW.rc @@ -50,7 +50,7 @@ BEGIN LTEXT "位元組:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "屬性(&P)", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "屬性(&P)", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "禁用(&D)", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "", IDC_STATUS, 83, 20, 98, 8 RTEXT "", IDC_DURATION, 83, 34, 98, 8 diff --git a/dll/win32/browseui/lang/hi-IN.rc b/dll/win32/browseui/lang/hi-IN.rc index 1e6cd20f40..d3c949e072 100644 --- a/dll/win32/browseui/lang/hi-IN.rc +++ b/dll/win32/browseui/lang/hi-IN.rc @@ -286,6 +286,7 @@ STRINGTABLE BEGIN IDS_BACK "%s पर वापस" IDS_FORWARD "%s के लिए आगे" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/devmgr/lang/cs-CZ.rc b/dll/win32/devmgr/lang/cs-CZ.rc index 106c3c65e7..cef5ec783a 100644 --- a/dll/win32/devmgr/lang/cs-CZ.rc +++ b/dll/win32/devmgr/lang/cs-CZ.rc @@ -313,6 +313,7 @@ BEGIN IDS_HINT_UNINSTALL " Odinstaluje ovladače vybraného zařízení." IDS_HINT_ADD " Umožní přidat do systému zastaralé zařízení nepodporující Plug and Play." IDS_HINT_ABOUT " Ukončí program.." + IDS_HINT_EXIT " Exits the program." IDS_HINT_DEV_BY_TYPE " Zobrazí zařízení podle typu hardwaru." IDS_HINT_DEV_BY_CONN " Zobrazí zařízení podle typu připojení." diff --git a/dll/win32/lsasrv/lang/it-IT.rc b/dll/win32/lsasrv/lang/it-IT.rc index 68c0ac0e75..6d37e81078 100644 --- a/dll/win32/lsasrv/lang/it-IT.rc +++ b/dll/win32/lsasrv/lang/it-IT.rc @@ -43,3 +43,36 @@ BEGIN IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "Utenti desktop Remoti" IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "Network Configuration Operators" END + +STRINGTABLE +BEGIN + IDS_CREATE_TOKEN_PRIVILEGE "Create a token object" + IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE "Replace a process level token" + IDS_LOCK_MEMORY_PRIVILEGE "Lock pages in memory" + IDS_INCREASE_QUOTA_PRIVILEGE "Adjust memory quotas for a process" + IDS_MACHINE_ACCOUNT_PRIVILEGE "Add workstations to domain" + IDS_TCB_PRIVILEGE "Act as part of the operating system" + IDS_SECURITY_PRIVILEGE "Manage auditing and security log" + IDS_TAKE_OWNERSHIP_PRIVILEGE "Take ownership of files or other objects" + IDS_LOAD_DRIVER_PRIVILEGE "Load and unload device drivers" + IDS_SYSTEM_PROFILE_PRIVILEGE "Profile system performance" + IDS_SYSTEMTIME_PRIVILEGE "Change the system time" + IDS_PROF_SINGLE_PROCESS_PRIVILEGE "Profile single process" + IDS_INC_BASE_PRIORITY_PRIVILEGE "Increase scheduling priority" + IDS_CREATE_PAGEFILE_PRIVILEGE "Create a pagefile" + IDS_CREATE_PERMANENT_PRIVILEGE "Create permanent shared objects" + IDS_BACKUP_PRIVILEGE "Back up files and directories" + IDS_RESTORE_PRIVILEGE "Restore files and directories" + IDS_SHUTDOWN_PRIVILEGE "Shut down the system" + IDS_DEBUG_PRIVILEGE "Debug programs" + IDS_AUDIT_PRIVILEGE "Generate security audits" + IDS_SYSTEM_ENVIRONMENT_PRIVILEGE "Modify firmware environment values" + IDS_CHANGE_NOTIFY_PRIVILEGE "Bypass traverse checking" + IDS_REMOTE_SHUTDOWN_PRIVILEGE "Force shutdown from a remote system" + IDS_UNDOCK_PRIVILEGE "Remove computer from docking station" + IDS_SYNC_AGENT_PRIVILEGE "Synchronize directory service data" + IDS_ENABLE_DELEGATION_PRIVILEGE "Enable computer and user accounts to be trusted for delegation" + IDS_MANAGE_VOLUME_PRIVILEGE "Perform volume maintenance tasks" + IDS_IMPERSONATE_PRIVILEGE "Impersonate a client after authentication" + IDS_CREATE_GLOBAL_PRIVILEGE "Create global objects" +END diff --git a/dll/win32/lsasrv/lang/sq-AL.rc b/dll/win32/lsasrv/lang/sq-AL.rc index 05536611e8..55084f4b55 100644 --- a/dll/win32/lsasrv/lang/sq-AL.rc +++ b/dll/win32/lsasrv/lang/sq-AL.rc @@ -46,3 +46,36 @@ BEGIN IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "Përdoruesit e Desktop-it në Distance" IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "Operatorët e Konfigurimit Rrjetit" END + +STRINGTABLE +BEGIN + IDS_CREATE_TOKEN_PRIVILEGE "Create a token object" + IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE "Replace a process level token" + IDS_LOCK_MEMORY_PRIVILEGE "Lock pages in memory" + IDS_INCREASE_QUOTA_PRIVILEGE "Adjust memory quotas for a process" + IDS_MACHINE_ACCOUNT_PRIVILEGE "Add workstations to domain" + IDS_TCB_PRIVILEGE "Act as part of the operating system" + IDS_SECURITY_PRIVILEGE "Manage auditing and security log" + IDS_TAKE_OWNERSHIP_PRIVILEGE "Take ownership of files or other objects" + IDS_LOAD_DRIVER_PRIVILEGE "Load and unload device drivers" + IDS_SYSTEM_PROFILE_PRIVILEGE "Profile system performance" + IDS_SYSTEMTIME_PRIVILEGE "Change the system time" + IDS_PROF_SINGLE_PROCESS_PRIVILEGE "Profile single process" + IDS_INC_BASE_PRIORITY_PRIVILEGE "Increase scheduling priority" + IDS_CREATE_PAGEFILE_PRIVILEGE "Create a pagefile" + IDS_CREATE_PERMANENT_PRIVILEGE "Create permanent shared objects" + IDS_BACKUP_PRIVILEGE "Back up files and directories" + IDS_RESTORE_PRIVILEGE "Restore files and directories" + IDS_SHUTDOWN_PRIVILEGE "Shut down the system" + IDS_DEBUG_PRIVILEGE "Debug programs" + IDS_AUDIT_PRIVILEGE "Generate security audits" + IDS_SYSTEM_ENVIRONMENT_PRIVILEGE "Modify firmware environment values" + IDS_CHANGE_NOTIFY_PRIVILEGE "Bypass traverse checking" + IDS_REMOTE_SHUTDOWN_PRIVILEGE "Force shutdown from a remote system" + IDS_UNDOCK_PRIVILEGE "Remove computer from docking station" + IDS_SYNC_AGENT_PRIVILEGE "Synchronize directory service data" + IDS_ENABLE_DELEGATION_PRIVILEGE "Enable computer and user accounts to be trusted for delegation" + IDS_MANAGE_VOLUME_PRIVILEGE "Perform volume maintenance tasks" + IDS_IMPERSONATE_PRIVILEGE "Impersonate a client after authentication" + IDS_CREATE_GLOBAL_PRIVILEGE "Create global objects" +END diff --git a/dll/win32/lsasrv/lang/tr-TR.rc b/dll/win32/lsasrv/lang/tr-TR.rc index b2a82aad59..73141319a7 100644 --- a/dll/win32/lsasrv/lang/tr-TR.rc +++ b/dll/win32/lsasrv/lang/tr-TR.rc @@ -44,3 +44,36 @@ BEGIN IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "Uzak Masaüstü Kullanıcıları" IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "Ağ Yapılandırma İşletmenleri" END + +STRINGTABLE +BEGIN + IDS_CREATE_TOKEN_PRIVILEGE "Create a token object" + IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE "Replace a process level token" + IDS_LOCK_MEMORY_PRIVILEGE "Lock pages in memory" + IDS_INCREASE_QUOTA_PRIVILEGE "Adjust memory quotas for a process" + IDS_MACHINE_ACCOUNT_PRIVILEGE "Add workstations to domain" + IDS_TCB_PRIVILEGE "Act as part of the operating system" + IDS_SECURITY_PRIVILEGE "Manage auditing and security log" + IDS_TAKE_OWNERSHIP_PRIVILEGE "Take ownership of files or other objects" + IDS_LOAD_DRIVER_PRIVILEGE "Load and unload device drivers" + IDS_SYSTEM_PROFILE_PRIVILEGE "Profile system performance" + IDS_SYSTEMTIME_PRIVILEGE "Change the system time" + IDS_PROF_SINGLE_PROCESS_PRIVILEGE "Profile single process" + IDS_INC_BASE_PRIORITY_PRIVILEGE "Increase scheduling priority" + IDS_CREATE_PAGEFILE_PRIVILEGE "Create a pagefile" + IDS_CREATE_PERMANENT_PRIVILEGE "Create permanent shared objects" + IDS_BACKUP_PRIVILEGE "Back up files and directories" + IDS_RESTORE_PRIVILEGE "Restore files and directories" + IDS_SHUTDOWN_PRIVILEGE "Shut down the system" + IDS_DEBUG_PRIVILEGE "Debug programs" + IDS_AUDIT_PRIVILEGE "Generate security audits" + IDS_SYSTEM_ENVIRONMENT_PRIVILEGE "Modify firmware environment values" + IDS_CHANGE_NOTIFY_PRIVILEGE "Bypass traverse checking" + IDS_REMOTE_SHUTDOWN_PRIVILEGE "Force shutdown from a remote system" + IDS_UNDOCK_PRIVILEGE "Remove computer from docking station" + IDS_SYNC_AGENT_PRIVILEGE "Synchronize directory service data" + IDS_ENABLE_DELEGATION_PRIVILEGE "Enable computer and user accounts to be trusted for delegation" + IDS_MANAGE_VOLUME_PRIVILEGE "Perform volume maintenance tasks" + IDS_IMPERSONATE_PRIVILEGE "Impersonate a client after authentication" + IDS_CREATE_GLOBAL_PRIVILEGE "Create global objects" +END diff --git a/dll/win32/lsasrv/lang/zh-CN.rc b/dll/win32/lsasrv/lang/zh-CN.rc index 23b90d0769..a3a3953e40 100644 --- a/dll/win32/lsasrv/lang/zh-CN.rc +++ b/dll/win32/lsasrv/lang/zh-CN.rc @@ -44,3 +44,36 @@ BEGIN IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "远程桌面用户" IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "网络配置操作员" END + +STRINGTABLE +BEGIN + IDS_CREATE_TOKEN_PRIVILEGE "Create a token object" + IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE "Replace a process level token" + IDS_LOCK_MEMORY_PRIVILEGE "Lock pages in memory" + IDS_INCREASE_QUOTA_PRIVILEGE "Adjust memory quotas for a process" + IDS_MACHINE_ACCOUNT_PRIVILEGE "Add workstations to domain" + IDS_TCB_PRIVILEGE "Act as part of the operating system" + IDS_SECURITY_PRIVILEGE "Manage auditing and security log" + IDS_TAKE_OWNERSHIP_PRIVILEGE "Take ownership of files or other objects" + IDS_LOAD_DRIVER_PRIVILEGE "Load and unload device drivers" + IDS_SYSTEM_PROFILE_PRIVILEGE "Profile system performance" + IDS_SYSTEMTIME_PRIVILEGE "Change the system time" + IDS_PROF_SINGLE_PROCESS_PRIVILEGE "Profile single process" + IDS_INC_BASE_PRIORITY_PRIVILEGE "Increase scheduling priority" + IDS_CREATE_PAGEFILE_PRIVILEGE "Create a pagefile" + IDS_CREATE_PERMANENT_PRIVILEGE "Create permanent shared objects" + IDS_BACKUP_PRIVILEGE "Back up files and directories" + IDS_RESTORE_PRIVILEGE "Restore files and directories" + IDS_SHUTDOWN_PRIVILEGE "Shut down the system" + IDS_DEBUG_PRIVILEGE "Debug programs" + IDS_AUDIT_PRIVILEGE "Generate security audits" + IDS_SYSTEM_ENVIRONMENT_PRIVILEGE "Modify firmware environment values" + IDS_CHANGE_NOTIFY_PRIVILEGE "Bypass traverse checking" + IDS_REMOTE_SHUTDOWN_PRIVILEGE "Force shutdown from a remote system" + IDS_UNDOCK_PRIVILEGE "Remove computer from docking station" + IDS_SYNC_AGENT_PRIVILEGE "Synchronize directory service data" + IDS_ENABLE_DELEGATION_PRIVILEGE "Enable computer and user accounts to be trusted for delegation" + IDS_MANAGE_VOLUME_PRIVILEGE "Perform volume maintenance tasks" + IDS_IMPERSONATE_PRIVILEGE "Impersonate a client after authentication" + IDS_CREATE_GLOBAL_PRIVILEGE "Create global objects" +END diff --git a/dll/win32/lsasrv/lang/zh-TW.rc b/dll/win32/lsasrv/lang/zh-TW.rc index 40ff153218..60686b433f 100644 --- a/dll/win32/lsasrv/lang/zh-TW.rc +++ b/dll/win32/lsasrv/lang/zh-TW.rc @@ -45,3 +45,35 @@ BEGIN IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "網路配置操作員" END +STRINGTABLE +BEGIN + IDS_CREATE_TOKEN_PRIVILEGE "Create a token object" + IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE "Replace a process level token" + IDS_LOCK_MEMORY_PRIVILEGE "Lock pages in memory" + IDS_INCREASE_QUOTA_PRIVILEGE "Adjust memory quotas for a process" + IDS_MACHINE_ACCOUNT_PRIVILEGE "Add workstations to domain" + IDS_TCB_PRIVILEGE "Act as part of the operating system" + IDS_SECURITY_PRIVILEGE "Manage auditing and security log" + IDS_TAKE_OWNERSHIP_PRIVILEGE "Take ownership of files or other objects" + IDS_LOAD_DRIVER_PRIVILEGE "Load and unload device drivers" + IDS_SYSTEM_PROFILE_PRIVILEGE "Profile system performance" + IDS_SYSTEMTIME_PRIVILEGE "Change the system time" + IDS_PROF_SINGLE_PROCESS_PRIVILEGE "Profile single process" + IDS_INC_BASE_PRIORITY_PRIVILEGE "Increase scheduling priority" + IDS_CREATE_PAGEFILE_PRIVILEGE "Create a pagefile" + IDS_CREATE_PERMANENT_PRIVILEGE "Create permanent shared objects" + IDS_BACKUP_PRIVILEGE "Back up files and directories" + IDS_RESTORE_PRIVILEGE "Restore files and directories" + IDS_SHUTDOWN_PRIVILEGE "Shut down the system" + IDS_DEBUG_PRIVILEGE "Debug programs" + IDS_AUDIT_PRIVILEGE "Generate security audits" + IDS_SYSTEM_ENVIRONMENT_PRIVILEGE "Modify firmware environment values" + IDS_CHANGE_NOTIFY_PRIVILEGE "Bypass traverse checking" + IDS_REMOTE_SHUTDOWN_PRIVILEGE "Force shutdown from a remote system" + IDS_UNDOCK_PRIVILEGE "Remove computer from docking station" + IDS_SYNC_AGENT_PRIVILEGE "Synchronize directory service data" + IDS_ENABLE_DELEGATION_PRIVILEGE "Enable computer and user accounts to be trusted for delegation" + IDS_MANAGE_VOLUME_PRIVILEGE "Perform volume maintenance tasks" + IDS_IMPERSONATE_PRIVILEGE "Impersonate a client after authentication" + IDS_CREATE_GLOBAL_PRIVILEGE "Create global objects" +END diff --git a/dll/win32/rasdlg/lang/no-NO.rc b/dll/win32/rasdlg/lang/no-NO.rc index 997ff22e33..071c352503 100644 --- a/dll/win32/rasdlg/lang/no-NO.rc +++ b/dll/win32/rasdlg/lang/no-NO.rc @@ -1955,6 +1955,7 @@ BEGIN 313 "Sikre mitt passord og min data\0" 314 "The %1 protocol cannot be selected because it is not installed or is disabled for Remote Access. To change, in Control Panel start Network, choose Services page, Remote Access Properties, and press the Network button.\0" 315 "Kan ikke lagre vise data.\0" + 316 "Cannot display data.\0" 317 "Kan ikke få auto-dial informasjon.\0" 318 "Kan ikke laste dialog.\0" 319 "Kan ikke deaktiver delt tilgang.\0" diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index ffdd79d6ca..448384f68e 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -67,6 +67,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Из&рязване", IDM_CUT MENUITEM "За&помняне", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Създаване на &връзка", IDM_CREATELINK MENUITEM "Из&триване", IDM_DELETE @@ -214,8 +215,8 @@ BEGIN CHECKBOX "Изпълняване с различни правомощия", IDC_SHORTEX_RUN_DIFFERENT, 30, 50, 150, 10 LTEXT "Тази възможност ви позволява да изпълните препратката като друг потребител или да продължите като себе си, като предпазвате компютъра и данните от неупълномощена дейност на приложенията.", -1, 50, 60, 200, 40 CHECKBOX "Изпълняване в отделен дял от паметта", IDC_SHORTEX_RUN_SEPARATE, 30, 100, 170, 10, WS_DISABLED - PUSHBUTTON "Добре", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Прекъсване", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Добре", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Прекъсване", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 99fef6743b..429dd34036 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "C&ut", IDM_CUT MENUITEM "&Copy", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Create &Link", IDM_CREATELINK MENUITEM "&Delete", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 5412233caf..daabd65bcd 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -72,6 +72,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Vyj&mout", IDM_CUT MENUITEM "&Kopírovat", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Vytvořit zástupc&e", IDM_CREATELINK MENUITEM "O&dstranit", IDM_DELETE @@ -219,8 +220,8 @@ BEGIN CHECKBOX "Spustit s jinými pověřeními", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Tato možnost umožní spustit tohoto zástupce jako jiný uživatel nebo při spuštění se současným uživatelem chránit počítač před nepovolenou aktivitou programu.", -1, 50, 60, 175, 40 CHECKBOX "Spustit v odděleném paměťovém prostoru", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Storno", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Storno", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 @@ -941,6 +942,26 @@ BEGIN IDS_OBJECTS "Položek: %d" IDS_OBJECTS_SELECTED "Položek vybráno: %d" + IDS_ADVANCED_FOLDER "Files and Folders" + IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers" + IDS_ADVANCED_FOLDER_SIZE_TIP "Display file size information in folder tips" + IDS_ADVANCED_FRIENDLY_TREE "Display simple folder view in Explorer's Folders list" + IDS_ADVANCED_WEB_VIEW_BARRICADE "Display the contents of system folders" + IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Display the full path in address bar" + IDS_ADVANCED_SHOW_FULL_PATH "Display the full path in the title bar" + IDS_ADVANCED_DISABLE_THUMB_CACHE "Do not cache thumbnails" + IDS_ADVANCED_HIDDEN "Hidden files and folders" + IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders" + IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders" + IDS_ADVANCED_HIDE_FILE_EXT "Hide extensions for known file types" + IDS_ADVANCED_SUPER_HIDDEN "Hide protected operating system files (Recommended)" + IDS_ADVANCED_DESKTOP_PROCESS "Launch folder windows in a separate process" + IDS_ADVANCED_CLASSIC_VIEW_STATE "Remember each folder's view settings" + IDS_ADVANCED_PERSIST_BROWSERS "Restore previous folder windows at logon" + IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" + IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" + IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 4fb9455d28..a39927ee99 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -72,6 +72,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "K&lip", IDM_CUT MENUITEM "&Kopiere", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Opret &Link", IDM_CREATELINK MENUITEM "&Slet", IDM_DELETE @@ -219,8 +220,8 @@ BEGIN CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index cc3a1e62b1..f86c5f262b 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Ausschneiden", IDM_CUT MENUITEM "&Kopieren", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "&Verknüpfung erstellen", IDM_CREATELINK MENUITEM "&Löschen", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Als anderer Benutzer ausführen", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Diese Einstellung ermöglicht es, diese Verknüpfung unter einem anderen oder Ihrem eigenen Benutzerkonto auszuführen während der Computer und Ihre Daten vor unautorisierten Programmaktivitäten geschützt werden können.", -1, 50, 60, 175, 40 CHECKBOX "In getrenntem Speicherbereich ausführen", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abbrechen", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Abbrechen", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index a4d64e37df..3a943f229c 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Α&ποκοπή", IDM_CUT MENUITEM "Α&ντιγραφή", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Δημιουργία &συντόμευσης", IDM_CREATELINK MENUITEM "&Διαγραφή", IDM_DELETE diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 5193a8a147..14e6654a48 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "C&ut", IDM_CUT MENUITEM "&Copy", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Create &Link", IDM_CREATELINK MENUITEM "&Delete", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index c2fe653b54..c5dd4829f4 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -214,8 +214,8 @@ BEGIN CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Cancel", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Cancel", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 94d270d794..e207b501f4 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -74,6 +74,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "C&ortar", IDM_CUT MENUITEM "&Copiar", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "C&rear acceso directo", IDM_CREATELINK MENUITEM "&Eliminar", IDM_DELETE @@ -221,8 +222,8 @@ BEGIN CHECKBOX "Ejecutar con credenciales diferentes", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Esta opción puede permitirle ejecutar este acceso directo como otro usuario, o continuar como usted mismo mientras protege su equipo y datos de una actividad de programa no autorizada.", -1, 50, 60, 175, 40 CHECKBOX "Ejecutar en otro espacio de memoria", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "Aceptar", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Cancelar", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Aceptar", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 0d7e94c576..1f9dee687f 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -221,8 +221,8 @@ BEGIN CHECKBOX "Käivita teistsuguse mandaadiga", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Selle suvandi abil saad käivitada otsetee teise või enda kasutajanime all, kaitstes samal ajal oma arvutit ja andmeid volitamata programmitegevuse eest.", -1, 50, 60, 175, 40 CHECKBOX "Käivita eraldi mäluruumis", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Loobu", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Loobu", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 39d9977420..3f284deaab 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Leikkaa", IDM_CUT MENUITEM "&Kopioi", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Lu&o Linkki", IDM_CREATELINK MENUITEM "&Poista", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 5767689c1a..1c525d04f0 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "C&ouper", IDM_CUT MENUITEM "&Copier", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Créer un &lien", IDM_CREATELINK MENUITEM "&Supprimer", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Exécuter avec des droits différents", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Cette option peut vous permettre d'utiliser ce raccourci en tant qu'autre utilisateur ou de continuer vous-même en protégeant votre ordinateur et vos données des activés de programme non autorisées.", -1, 50, 60, 175, 40 CHECKBOX "Lancer dans un espace mémoire séparé", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Annuler", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Annuler", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 59cd236710..f734560050 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "גזור", IDM_CUT MENUITEM "העתק", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "צור קישור", IDM_CREATELINK MENUITEM "מחק", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "הרץ בטווח זיכרון מופרד", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "אישור", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "ביטול", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "אישור", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "ביטול", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 53462a60a0..3d759b38b1 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -214,8 +214,8 @@ BEGIN CHECKBOX "विभिन्न क्रिडेन्शॅल के साथ रन करें", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "यह विकल्प आपको इस शॉर्टकट को किसी अन्य उपयोगकर्ता के रूप में चलाने की अनुमति दे सकता है, या अनधिकृत प्रोग्राम गतिविधि से आपके कंप्यूटर और डेटा की सुरक्षा करते समय स्वयं के रूप में जारी रख सकता है।", -1, 50, 60, 175, 40 CHECKBOX "अलग मेमोरी स्पेस में चलाएं", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "ओके", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "रद्द करें", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "ओके", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "रद्द करें", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index f4f96e6873..bab678e9d8 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Kivágás", IDM_CUT MENUITEM "Másolás", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Parancsikon létrehozása", IDM_CREATELINK MENUITEM "Törlés", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index b9215aefb7..f4de79b596 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Taglia", IDM_CUT MENUITEM "&Copia", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "&Crea Collegamento", IDM_CREATELINK MENUITEM "&Cancella", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Eseguire con credenziali diverse", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Questa opzione permette l'esecuzione del collegamento come se si fosse un altro utente o di proteggere il computer e i dati da attività non autorizzate del programma.", -1, 50, 60, 175, 40 CHECKBOX "Eseguire in uno spazio di memoria separato", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Annulla", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Annulla", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 977202de71..9e5d792fd2 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "切り取り(&U)", IDM_CUT MENUITEM "コピー(&C)", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "ショートカットの作成(&L)", IDM_CREATELINK MENUITEM "削除(&D)", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "異なる人物証明情報で実行する", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "このオプションを使用するとこのショートカットを別のユーザーとして実行できます。また、自分自身で実行する場合、許可されていないプログラムの活動からコンピュータとデータを保護できます。", -1, 50, 60, 175, 40 CHECKBOX "別のメモリ領域で実行する", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "中止", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "中止", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index dd45e850db..af088d2160 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "C&ut", IDM_CUT MENUITEM "&Copy", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Create &Link", IDM_CREATELINK MENUITEM "&Delete", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index fab5179d96..cc7bc171dd 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "C&ut", IDM_CUT MENUITEM "&Copy", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Create &Link", IDM_CREATELINK MENUITEM "&Delete", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 1282fc73c3..997fd580b1 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Klipp &ut", IDM_CUT MENUITEM "&Kopier", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "&Opprett snarvei", IDM_CREATELINK MENUITEM "&Slett", IDM_DELETE diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index c922e682ec..8e808a890a 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -219,8 +219,8 @@ BEGIN CHECKBOX "Uruchom z innym Użytkownikiem", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Ta opcja pozwoli ci na uruchomienie skrótu jako inny użytkownik, do ochrony twoich danych przed niepowołanym dostępem.", -1, 50, 60, 175, 40 CHECKBOX "Uruchom w osobnym przedziale pamięci", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Przerwij", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Przerwij", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index e300e15ec8..9b3cb6744e 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "C&ortar", IDM_CUT MENUITEM "&Copiar", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Criar a&talho", IDM_CREATELINK MENUITEM "E&xcluir", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Executar com credenciais diferentes", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Esta opção permite você executar este atalho como outro usuário, ou continuar como si próprio enquanto protege seu computador e dados de atividades de programas não autorizados.", -1, 50, 60, 175, 40 CHECKBOX "Executar em espaço de memória separado", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abortar", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Abortar", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index d4afb55a5c..5b30db67e8 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "C&ortar", IDM_CUT MENUITEM "&Copiar", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Criar &Link", IDM_CREATELINK MENUITEM "&Apagar", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Executar com diferentes credenciais", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Esta opção permite executar este atalho como outro utilizador, ou continue com a sua conta enquanto protege o seu computador e dados contra actividade de programas não autorizados.", -1, 50, 60, 175, 40 CHECKBOX "Executar num espaço de memória separada", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abortar", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Abortar", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index ec4b8651f4..57a0b70fc3 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -68,6 +68,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Decupează", IDM_CUT MENUITEM "&Copiază", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Crează sc&urtătură", IDM_CREATELINK MENUITEM "Șt&erge", IDM_DELETE @@ -215,8 +216,8 @@ BEGIN CHECKBOX "Execută sub o i&dentitate explicită", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Această opțiune vă permite execuția scurtăturii sub autoritatea unui alt utilizator sau continuarea folosirii scurtăturii în mod securizat, protejând astfel calculatorul de activități neautorizate.", -1, 50, 60, 175, 40 CHECKBOX "Execută în sp&ațiu de memorie separat", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "Con&firmă", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "A&nulează", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Con&firmă", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "A&nulează", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 @@ -493,7 +494,7 @@ CAPTION "Deautentificare" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Sigur doriți să vă deautentificați?", IDC_STATIC, 35, 16, 146, 8 + LTEXT "Sigur doriți să vă deautentificați?", -1, 35, 16, 146, 8 DEFPUSHBUTTON "&Deautentifică", IDOK, 41, 39, 50, 14 PUSHBUTTON "A&nulează", IDCANCEL, 95, 39, 50, 14 END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 6aab59fab5..5d56f1f7f3 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -73,6 +73,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Вырезать", IDM_CUT MENUITEM "&Копировать", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Создать &ярлык", IDM_CREATELINK MENUITEM "&Удалить", IDM_DELETE diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 6ea9041d59..25a9ba1461 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Vystrihnúť", IDM_CUT MENUITEM "&Kopírovať", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Vytvoriť o&dkaz", IDM_CREATELINK MENUITEM "&Odstrániť", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "&Spustiť s inými povereniami", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Táto možnosť umožňuje spustiť tento odkaz ako iný používateľ, alebo pokračovať so svojím používateľským oprávnením, ale s ochranou počítača a údajov pred neoprávnenými aktivitami programu.", -1, 50, 60, 170, 40 CHECKBOX "Spustiť v oddelenom pa&mäťovom priestore", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 190, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Prerušiť", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Prerušiť", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 18dbf64927..deb4179a91 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -27,7 +27,7 @@ BEGIN MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END MENUITEM "", -1, MFT_SEPARATOR - POPUP "Arrange &Icons By", FCIDM_SHVIEW_VIEW + POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE BEGIN MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "C&ut", IDM_CUT MENUITEM "&Copy", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Create &Link", IDM_CREATELINK MENUITEM "&Delete", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index f7f98d67f0..ad7d9417d3 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -70,6 +70,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Prej", IDM_CUT MENUITEM "&Kopjo", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Krijo &Lidhje", IDM_CREATELINK MENUITEM "&Fshi", IDM_DELETE @@ -217,8 +218,8 @@ BEGIN CHECKBOX "Ekzekuto me kredenciale të ndryshme", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Ky opsion mund të lejojë për të drejtuar këtë ikonë si një përdorues tjetër, ose të vazhdojë si veten tënde, duke mbrojtur kompjuterin tuaj dhe të dhënat nga aktiviteti i paautorizuar i programit.", -1, 50, 60, 175, 40 CHECKBOX "Ekzekuto në hapësirë të veçantë që e kujtesës", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Ndërprej", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Ndërprej", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 1e2caefde9..5ba90e530b 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "K&lipp ut", IDM_CUT MENUITEM "&Kopiera", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Skapa &genväg", IDM_CREATELINK MENUITEM "&Ta bort", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Kör med andra användaruppgifter", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Det här alternativet tillåter dig att köra genvägen som en annan användare eller som dig själv samtidigt som din dator skyddas från otillåten programaktivitet.", -1, 50, 60, 175, 40 CHECKBOX "Kör i seperat minnesutrymme", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Avbryt", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Avbryt", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 753cbdc99d..9eaa2a7c34 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -68,6 +68,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Kes", IDM_CUT MENUITEM "&Çoğalt", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "K&ısayol Oluştur", IDM_CREATELINK MENUITEM "&Sil", IDM_DELETE @@ -215,8 +216,8 @@ BEGIN CHECKBOX "&Ayrı Kimlik Bilgileriyle Çalıştır", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Bu seçenek, bu kısayolu başka bir kullanıcı olarak çalıştırmanızı veyâ yetkilendirilmemiş izlence etkinliğinden bilgisayarınızı ve verinizi koruyarak kendiniz olarak sürdürmenizi sağlayabilir.", -1, 50, 60, 175, 40 CHECKBOX "A&yrı Bellek Alanında Çalıştır", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "Tamam", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "İptal", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Tamam", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "İptal", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 59f72c0a47..d1c45341a6 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -66,6 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Вирізати", IDM_CUT MENUITEM "&Копіювати", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Створити &ярлик", IDM_CREATELINK MENUITEM "В&идалити", IDM_DELETE @@ -213,8 +214,8 @@ BEGIN CHECKBOX "Запускати з іншими обліковими даними", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Цей параметр дозволяє використовувати цей ярлик від імені іншого користувача або продовжувати роботу від свого імені, що захищає комп'ютер й дані від несанкціонованих дій програми.", -1, 50, 60, 175, 40 CHECKBOX "Запускати в окремій області пам'яті", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Скасувати", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Скасувати", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 05a7d1deb3..b355bcc388 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -76,6 +76,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "剪切(&U)", IDM_CUT MENUITEM "复制(&C)", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "创建快捷方式(&L)", IDM_CREATELINK MENUITEM "删除(&D)", IDM_DELETE @@ -223,8 +224,8 @@ BEGIN CHECKBOX "以其他用户身份运行", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "此选项允许您以其他用户身份运行此快捷方式，或者在保护计算机和数据免受未经授权的程序活动的同时继续自行运行。", -1, 50, 60, 175, 40 CHECKBOX "在单独的内存空间中运行", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "确定", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "取消", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "确定", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "取消", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 30ca5829fb..1369c53a22 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -75,6 +75,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "剪下(&U)", IDM_CUT MENUITEM "複製(&C)", IDM_COPY + MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR MENUITEM "建立捷徑(&L)", IDM_CREATELINK MENUITEM "刪除(&D)", IDM_DELETE @@ -222,8 +223,8 @@ BEGIN CHECKBOX "以不同的身分執行", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "在獨立的記憶體空間中執行", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED - PUSHBUTTON "確定", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "取消", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "確定", IDOK, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "取消", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 diff --git a/dll/win32/tapiui/lang/de-DE.rc b/dll/win32/tapiui/lang/de-DE.rc index 24f5539e79..10aca15438 100644 --- a/dll/win32/tapiui/lang/de-DE.rc +++ b/dll/win32/tapiui/lang/de-DE.rc @@ -369,6 +369,7 @@ BEGIN 43 "Auf das Ende eine Sprachnachricht warten" 44 "Die Landeskennzahl, Vorwahl und Rufnummer wählen" 45 "Die Vorwahl und Rufnummer wählen" + 46 "Dial the area code and number." 47 "Die Landeskennzahl wählen" 48 "Die Vorwahl wählen" 49 "Die Rufnummer wählen" diff --git a/modules/rosapps/applications/winfile/lang/pl-PL.rc b/modules/rosapps/applications/winfile/lang/pl-PL.rc index 1323764ae4..56f220f9e0 100644 --- a/modules/rosapps/applications/winfile/lang/pl-PL.rc +++ b/modules/rosapps/applications/winfile/lang/pl-PL.rc @@ -95,10 +95,10 @@ IDM_WINEFILE MENU MENUITEM "&Wszystkie atrybuty pliku", ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "Wybrane &atrybuty pliku...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "P&osortuj alfabetycznie", 404 - MENUITEM "Posortuj po &typie", 405 - MENUITEM "Posortuj po wie&lkości", 406 - MENUITEM "Po&sortuj po dacie", 407 + MENUITEM "P&osortuj alfabetycznie", ID_VIEW_SORT_NAME + MENUITEM "Posortuj po &typie", ID_VIEW_SORT_TYPE + MENUITEM "Posortuj po wie&lkości", ID_VIEW_SORT_SIZE + MENUITEM "Po&sortuj po dacie", ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Filtruj widok &...", ID_VIEW_FILTER } @@ -116,7 +116,7 @@ IDM_WINEFILE MENU #endif MENUITEM SEPARATOR MENUITEM "&Zminimalizuj przy starcie", 504 - MENUITEM "Z&apisz ustawienia przed zakończeniem",511 + MENUITEM "Z&apisz ustawienia przed zakończeniem",ID_VIEW_SAVESETTINGS } diff --git a/subsystems/mvdm/ntvdm/lang/zh-CN.rc b/subsystems/mvdm/ntvdm/lang/zh-CN.rc index fce7177bf5..e6703bb4a2 100644 --- a/subsystems/mvdm/ntvdm/lang/zh-CN.rc +++ b/subsystems/mvdm/ntvdm/lang/zh-CN.rc @@ -13,5 +13,12 @@ STRINGTABLE BEGIN IDS_VDM_DUMPMEM_TXT, "内存转储 (文本) (&T)" IDS_VDM_DUMPMEM_BIN, "内存转储 (二进制) (&B)" + IDS_VDM_MOUNT_FLOPPY, "Insert a floppy in drive %d <%s>..." + IDS_VDM_EJECT_FLOPPY, "Eject floppy from drive %d" IDS_VDM_QUIT , "退出 ReactOS DOS 虚拟机 (&Q)" END + +STRINGTABLE +BEGIN + IDS_NO_MEDIA, "No media" +END diff --git a/win32ss/user/winsrv/usersrv/lang/hu-HU.rc b/win32ss/user/winsrv/usersrv/lang/hu-HU.rc index 8b55512225..ba3c76c415 100644 --- a/win32ss/user/winsrv/usersrv/lang/hu-HU.rc +++ b/win32ss/user/winsrv/usersrv/lang/hu-HU.rc @@ -24,3 +24,20 @@ BEGIN LTEXT "Hogy visszatérj ReactOS-ba és ellenőrizd a státuszát a programnak, kattins a Mégsére.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Ha azt választod, hogy azzonal bezársz egy programot, minden nem mentett adatot vesztesz. A program mostani bezárásához, kattints a Bezásás Most-ra.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END

6 years

[reactos] 01/01: [SDK] Reset InDbgPrint state when an exception occurs Previously this would not get reset, and all debug prints from the current thread would be muted.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db8488e5cacc8d0ecb3bb… commit db8488e5cacc8d0ecb3bb0fec7b7f68ad235165d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Jan 4 21:55:38 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 5 15:21:40 2019 +0100 [SDK] Reset InDbgPrint state when an exception occurs Previously this would not get reset, and all debug prints from the current thread would be muted. --- sdk/lib/rtl/debug.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/lib/rtl/debug.c b/sdk/lib/rtl/debug.c index 0f9b2cc32a..3c0be05549 100644 --- a/sdk/lib/rtl/debug.c +++ b/sdk/lib/rtl/debug.c @@ -91,6 +91,8 @@ vDbgPrintExWithPrefixInternal(IN PCCH Prefix, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + /* In user-mode, clear the InDbgPrint Flag */ + RtlpClearInDbgPrint(); /* Fail */ _SEH2_YIELD(return _SEH2_GetExceptionCode()); } @@ -129,8 +131,8 @@ vDbgPrintExWithPrefixInternal(IN PCCH Prefix, /* Raise the exception */ RtlRaiseException(&ExceptionRecord); - /* This code only runs in user-mode, so setting the flag is safe */ - NtCurrentTeb()->InDbgPrint = FALSE; + /* In user-mode, clear the InDbgPrint Flag */ + RtlpClearInDbgPrint(); return STATUS_SUCCESS; }

6 years

[reactos] 01/01: [NET] Implement the /add and /del options of the computer command.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=372363930f3c55ec4e9ca… commit 372363930f3c55ec4e9ca35363ee0445f3cd2a13 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 5 14:54:40 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jan 5 15:04:09 2019 +0100 [NET] Implement the /add and /del options of the computer command. --- base/applications/network/net/cmdComputer.c | 51 ++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/base/applications/network/net/cmdComputer.c b/base/applications/network/net/cmdComputer.c index c094885361..f6ddf3c037 100644 --- a/base/applications/network/net/cmdComputer.c +++ b/base/applications/network/net/cmdComputer.c @@ -12,10 +12,14 @@ cmdComputer( INT argc, WCHAR **argv) { + WCHAR ComputerAccountName[MAX_PATH + 2]; + WCHAR ComputerPassword[LM20_PWLEN + 1]; + USER_INFO_1 UserInfo; INT i, result = 0; BOOL bAdd = FALSE; BOOL bDelete = FALSE; PWSTR pComputerName = NULL; + NET_API_STATUS Status = NERR_Success; /* OSVERSIONINFOEX VersionInfo; @@ -34,7 +38,7 @@ cmdComputer( */ i = 2; - if (argc > 2 && argv[i][0] != L'\\' && argv[i][1] != L'\\') + if (argc > 2 && argv[i][0] == L'\\' && argv[i][1] == L'\\') { pComputerName = argv[i]; i++; @@ -85,17 +89,56 @@ cmdComputer( return 1; } + /* + * Create the computer account name: + * Skip the leading '\\' and appand a '$'. + */ + wcscpy(ComputerAccountName, &pComputerName[2]); + wcscat(ComputerAccountName, L"$"); + if (bAdd) { - printf("Add %S (not implemented yet)\n", pComputerName); + /* + * Create the computer password: + * Skip the leading '\\', shorten to a maximum of 14 characters + * and convert to lower case + */ + wcsncpy(ComputerPassword, &pComputerName[2], LM20_PWLEN); + ComputerPassword[LM20_PWLEN] = UNICODE_NULL; + _wcslwr(ComputerPassword); + + /* Set the account data */ + UserInfo.usri1_name = ComputerAccountName; + UserInfo.usri1_password = ComputerPassword; + UserInfo.usri1_password_age = 0; + UserInfo.usri1_priv = USER_PRIV_USER; + UserInfo.usri1_home_dir = NULL; + UserInfo.usri1_comment = NULL; + UserInfo.usri1_flags = UF_SCRIPT | UF_WORKSTATION_TRUST_ACCOUNT; + UserInfo.usri1_script_path = NULL; + + /* Add the computer account */ + Status = NetUserAdd(NULL, + 1, + (LPBYTE)&UserInfo, + NULL); } else if (bDelete) { - printf("Delete %S (not implemented yet)\n", pComputerName); + /* Delete the coputer account */ + Status = NetUserDel(NULL, + ComputerAccountName); } - if (result == 0) + if (Status == NERR_Success) + { PrintErrorMessage(ERROR_SUCCESS); + } + else + { + PrintErrorMessage(Status); + result = 1; + } return result; }

6 years

[reactos] 01/01: [VCDCONTROLTOOL] Implement Romanian & Italian translations (#1218)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e549de4924654de11f106… commit e549de4924654de11f10606f2c98946ab0e2dffe Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sat Jan 5 14:54:57 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 5 14:54:57 2019 +0100 [VCDCONTROLTOOL] Implement Romanian & Italian translations (#1218) --- .../applications/vcdcontroltool/lang/it-IT.rc | 69 ++++++++++++++++++++++ .../applications/vcdcontroltool/lang/ro-RO.rc | 69 ++++++++++++++++++++++ .../applications/vcdcontroltool/vcdcontroltool.rc | 6 ++ 3 files changed, 144 insertions(+) diff --git a/modules/rosapps/applications/vcdcontroltool/lang/it-IT.rc b/modules/rosapps/applications/vcdcontroltool/lang/it-IT.rc new file mode 100644 index 0000000000..dea61e3a96 --- /dev/null +++ b/modules/rosapps/applications/vcdcontroltool/lang/it-IT.rc @@ -0,0 +1,69 @@ +/* + * PROJECT: ReactOS Virtual CD Control Tool + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Italian resource file + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_MAINWINDOW DIALOGEX 0, 0, 320, 200 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Pannello di controllo dell'unità virtuale CD-ROM" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_MAINOK, 211, 179, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_MAINDEVICES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 7, 7, 306, 83 + GROUPBOX "Geometria del driver", IDC_STATIC, 7, 101, 153, 74, BS_GROUPBOX | WS_CHILD | WS_VISIBLE + LTEXT "Numero dei settori", IDC_STATIC, 15, 115, 60, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Dimensione settore", IDC_STATIC, 15, 127, 49, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Cluster liberi", IDC_STATIC, 15, 139, 49, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Totale di cluster", IDC_STATIC, 15, 151, 49, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_MAINSECTORS, 88, 115, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINSIZE, 88, 127, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINFREE, 88, 139, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINTOTAL, 88, 151, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Aggiungi Drive", IDC_MAINADD, 183, 123, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Rimuovi Drive", IDC_MAINREMOVE, 242, 123, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Monta", IDC_MAINMOUNT, 183, 142, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Espelli", IDC_MAINEJECT, 183, 161, 109, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Rimonta", IDC_MAINREMOUNT, 242, 142, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Controllo Driver ...", IDC_MAINCONTROL, 183, 105, 109, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_MOUNTWINDOW DIALOG 0, 0, 187, 97 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Opzioni di montaggio specifiche" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_MOUNTOK, 130, 59, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Annulla", IDC_MOUNTCANCEL, 130, 76, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT IDC_MOUNTIMAGE, 7, 17, 173, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + LTEXT "Immagine da montare", IDC_STATIC, 7, 7, 173, 10, SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE | WS_GROUP + AUTOCHECKBOX "Tralasciare UDF", IDC_MOUNTUDF, 7, 40, 114, 10, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "Tralasciare Joliet", IDC_MOUNTJOLIET, 7, 56, 111, 9, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "Montaggio persistente", IDC_MOUNTPERSIST, 7, 71, 111, 9, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_DRIVERWINDOW DIALOG 0, 0, 189, 123 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Controllo driver dell'unità virtuale CD-ROM" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_DRIVEROK, 43, 98, 103, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Installa Driver ...", IDC_DRIVERINSTALL, 43, 61, 51, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Start", IDC_DRIVERSTART, 43, 79, 51, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Stop", IDC_DRIVERSTOP, 96, 79, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Rimuovi Driver", IDC_DRIVERREMOVE, 96, 61, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT IDC_DRIVERINFO, 7, 7, 175, 50, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_DRIVE "Drive" + IDS_MAPPEDIMAGE "Immagine mappata" + IDS_NOMOUNTED "Nessuna immagine montata. L'ultimo immagine era - %s" + IDS_NONE "Nessuna" + IDS_FILTER "Tutte le immagini supportati (*.udf; *.cdfs; *.jo; *.iso; *.rock)\0*.udf;*.cdfs;*.jo;*.iso;*.rock\0" +END diff --git a/modules/rosapps/applications/vcdcontroltool/lang/ro-RO.rc b/modules/rosapps/applications/vcdcontroltool/lang/ro-RO.rc new file mode 100644 index 0000000000..e66f51edb8 --- /dev/null +++ b/modules/rosapps/applications/vcdcontroltool/lang/ro-RO.rc @@ -0,0 +1,69 @@ +/* + * PROJECT: ReactOS Virtual CD Control Tool + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_MAINWINDOW DIALOGEX 0, 0, 320, 200 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Panou de control de la unitatea virtuală CDRom" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_MAINOK, 211, 179, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_MAINDEVICES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 7, 7, 306, 83 + GROUPBOX "Geometria unități de stocare", IDC_STATIC, 7, 101, 153, 74, BS_GROUPBOX | WS_CHILD | WS_VISIBLE + LTEXT "Numărul de sectoare", IDC_STATIC, 15, 115, 60, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Dimensiune sector", IDC_STATIC, 15, 127, 49, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Cluster libere", IDC_STATIC, 15, 139, 49, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Total cluster", IDC_STATIC, 15, 151, 49, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_MAINSECTORS, 88, 115, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINSIZE, 88, 127, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINFREE, 88, 139, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINTOTAL, 88, 151, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Adaugă unitate de stocare", IDC_MAINADD, 183, 123, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ș&terge unitate de stocare", IDC_MAINREMOVE, 242, 123, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Montează", IDC_MAINMOUNT, 183, 142, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Scoate", IDC_MAINEJECT, 183, 161, 109, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Remontează", IDC_MAINREMOUNT, 242, 142, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Controlează unitatea de stocare ...", IDC_MAINCONTROL, 183, 105, 109, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_MOUNTWINDOW DIALOG 0, 0, 187, 97 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Opțiuni specifici de montare" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_MOUNTOK, 130, 59, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Anulează", IDC_MOUNTCANCEL, 130, 76, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT IDC_MOUNTIMAGE, 7, 17, 173, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + LTEXT "Imagine de montat", IDC_STATIC, 7, 7, 173, 10, SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE | WS_GROUP + AUTOCHECKBOX "Suprimă UDF", IDC_MOUNTUDF, 7, 40, 114, 10, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "Suprimă Joliet", IDC_MOUNTJOLIET, 7, 56, 111, 9, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "Montaj persistent", IDC_MOUNTPERSIST, 7, 71, 111, 9, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_DRIVERWINDOW DIALOG 0, 0, 189, 123 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Controlul unități de stocare virtuală CDRom" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_DRIVEROK, 43, 98, 103, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Instalează unitate de stocare ...", IDC_DRIVERINSTALL, 43, 61, 51, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Start", IDC_DRIVERSTART, 43, 79, 51, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Stop", IDC_DRIVERSTOP, 96, 79, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Șterge unitate de stocare", IDC_DRIVERREMOVE, 96, 61, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT IDC_DRIVERINFO, 7, 7, 175, 50, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_DRIVE "Unitate de stocare" + IDS_MAPPEDIMAGE "Imagine mapată" + IDS_NOMOUNTED "Nu este nici o imagine montată. Ultimul era - %s" + IDS_NONE "Nici una" + IDS_FILTER "Toate imaginile suportate (*.udf; *.cdfs; *.jo; *.iso; *.rock)\0*.udf;*.cdfs;*.jo;*.iso;*.rock\0" +END diff --git a/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc index 9e08063248..968f845eb0 100644 --- a/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc +++ b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc @@ -25,6 +25,12 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif

6 years

[reactos] 01/01: [MSVCRT] export _except_handler4_common

by Denis Malikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=343bc197200e186a246dc… commit 343bc197200e186a246dcc6867f9b92a7f0682a8 Author: Denis Malikov <filedem(a)gmail.com> AuthorDate: Mon Nov 19 00:02:22 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 5 13:44:33 2019 +0100 [MSVCRT] export _except_handler4_common --- dll/apisets/api-ms-win-core-crt-l1-1-0.spec | 2 +- dll/apisets/api-ms-win-crt-private-l1-1-0.spec | 2 +- dll/win32/msvcrt/msvcrt.spec | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/apisets/api-ms-win-core-crt-l1-1-0.spec b/dll/apisets/api-ms-win-core-crt-l1-1-0.spec index 5e7595c4fc..3656f37ffd 100644 --- a/dll/apisets/api-ms-win-core-crt-l1-1-0.spec +++ b/dll/apisets/api-ms-win-core-crt-l1-1-0.spec @@ -4,7 +4,7 @@ @ stdcall __isascii() msvcrt.__isascii @ stdcall _atoi64() msvcrt._atoi64 @ stdcall _errno() msvcrt._errno -@ stub _except_handler4_common +@ stdcall -version=0x600+ _except_handler4_common() msvcrt._except_handler4_common @ stdcall -arch=i386,x86_64,arm _fltused() ntdll._fltused @ stdcall -arch=i386 _ftol() msvcrt._ftol @ stub _ftol2 diff --git a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec index 7b047ee11a..ef7d058410 100644 --- a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec @@ -57,7 +57,7 @@ @ stdcall -arch=i386 _chkesp() msvcrt._chkesp @ stdcall -arch=i386 _except_handler2() msvcrt._except_handler2 @ stdcall -arch=i386 _except_handler3() msvcrt._except_handler3 -@ stub _except_handler4_common +@ stdcall -version=0x600+ _except_handler4_common() msvcrt._except_handler4_common @ stub _get_purecall_handler @ stub _get_unexpected @ stdcall -arch=i386 _global_unwind2() msvcrt._global_unwind2 diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 202bf7e115..f2425c953e 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -367,6 +367,7 @@ @ cdecl _errno() @ cdecl -i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -i386 _except_handler3(ptr ptr ptr ptr) +@ cdecl -i386 -version=0x600+ _except_handler4_common(ptr ptr ptr ptr ptr ptr) @ varargs _execl(str str) @ varargs _execle(str str) @ varargs _execlp(str str)

6 years

← Newer
1
...
22
23
24
25
26
27
28
29
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2019